Merge branch 'main' into dev

catalyst-cooperative · Dec 25, 2023 · 0d411c3 · 0d411c3
2 parents f51a55c + 702b2ef
commit 0d411c3
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/.github/workflows/update-conda-lockfile.yml b/.github/workflows/update-conda-lockfile.yml
@@ -9,16 +9,18 @@ on:
 # What branch does this action run on?
 # - workflow_dispatch: Whatever branch it was run against.
 # - schedule: Always the same branch (will be dev or main)
-# - push: Base branch of the PR.
 
 jobs:
   update-conda-lockfile:
     runs-on: ubuntu-latest
-    if: ${{ (github.event_name == 'push' && github.actor != 'pudlbot') || (github.event_name == 'schedule' && github.repository == 'catalyst-cooperative/pudl') || (github.event_name == 'workflow_dispatch') }}
+    if: ${{ (github.event_name == 'schedule' && github.repository == 'catalyst-cooperative/pudl') || (github.event_name == 'workflow_dispatch') }}
     defaults:
       run:
         shell: bash -l {0}
     steps:
+      - name: Get today's date
+        run: |
+          echo "TODAY=$(date +%Y-%m-%d)" >> $GITHUB_ENV
       - name: Set GITHUB_REF for use with workflow_dispatch
         if: ${{ (github.event_name == 'workflow_dispatch') }}
         run: |
@@ -27,10 +29,6 @@ jobs:
         if: ${{ (github.event_name == 'schedule') }}
         run: |
           echo "GITHUB_REF=dev" >> $GITHUB_ENV
-      - name: Set GITHUB_REF for use with push
-        if: ${{ (github.event_name == 'push') }}
-        run: |
-          echo "GITHUB_REF="${{ github.ref_name }} >> $GITHUB_ENV
       - name: Log final value of GITHUB_REF
         run: |
           echo "Final GITHUB_REF:" ${{ env.GITHUB_REF }}
@@ -50,15 +48,6 @@ jobs:
         run: |
           make conda-clean
           make conda-lock.yml
-      - name: Commit updated conda lockfiles to branch
-        # If running on push due to dependency changes, commit directly to the base
-        # branch of the existing PR. Don't trigger the workflow again if we're already
-        # running it as pudlbot (to avoid infinite recursion).
-        if: ${{ (github.event_name == 'push' && github.actor != 'pudlbot') }}
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          file_pattern: "environments/*"
-          commit_message: "Update conda-lock.yml and rendered conda environment files."
       - name: Make a PR to merge updated conda lockfiles
         # If we are relocking dependencies on a schedule or workflow_dispatch, we need
         # to make our own PR to check whether the updated environment actually solves
@@ -68,7 +57,7 @@ jobs:
         with:
           token: ${{ secrets.PUDL_BOT_PAT }}
           commit-message: "Update conda-lock.yml and rendered conda environment files."
-          title: Update Lockfile
+          title: Update conda lockfile for week of ${{ env.TODAY }}
           body: >
             This pull request relocks the dependencies with conda-lock.
             It is triggered by [update-conda-lockfile](https://github.com/catalyst-cooperative/pudl/blob/main/.github/workflows/update-conda-lockfile.yml).