Skip to content

Commit

Permalink
Fix (more) v2024.02.03 release issues (#3346)
Browse files Browse the repository at this point in the history
* Simplify BATCH_JOB_ID, don't create GH discussion.
* Update release notes date.
* Remove duplicate --output from batch config script args
  • Loading branch information
zaneselvans authored Feb 4, 2024
1 parent 078028d commit dc55ddc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-deploy-pudl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@ jobs:
run: |
echo "NIGHTLY_TAG=nightly-$(date +%Y-%m-%d)" >> $GITHUB_ENV
echo "BUILD_ID=$(date +%Y-%m-%d-%H%M)-$(git rev-parse --short HEAD)-${{ github.ref_name }}" >> $GITHUB_ENV
echo "GOOGLE_BATCH_JOB_ID=$(echo ${{ env.BUILD_ID }} | tr '.' '-')" >> $GITHUB_ENV
echo "BATCH_JOB_ID=$(date +%Y-%m-%d-%H%M)-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
- name: Show freshly set envvars
if: ${{ env.SKIP_BUILD != 'true' }}
run: |
echo "GCE_INSTANCE: $GCE_INSTANCE"
echo "NIGHTLY_TAG: $NIGHTLY_TAG"
echo "BUILD_ID: $BUILD_ID"
echo "BATCH_JOB_ID: $BATCH_JOB_ID"
- name: Tag nightly build
if: ${{ (github.event_name == 'schedule') && (env.SKIP_BUILD != 'true') }}
Expand Down Expand Up @@ -124,7 +125,6 @@ jobs:
PUDL_GCS_OUTPUT: ${{ env.GCS_OUTPUT_BUCKET }}/${{ env.BUILD_ID }}
run: |-
./devtools/generate_batch_config.py \
--output ${{ env.BATCH_JOB_JSON }} \
--container-image "docker.io/catalystcoop/pudl-etl@${{ steps.docker-build.outputs.digest }}" \
--container-command "micromamba" \
--container-arg="run" \
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
# Start the batch job
- name: Kick off batch job
run: gcloud batch jobs submit run-etl-${{ env.GOOGLE_BATCH_JOB_ID }} --config ${{ env.BATCH_JOB_JSON }} --location us-west1
run: gcloud batch jobs submit run-etl-${{ env.BATCH_JOB_ID }} --config ${{ env.BATCH_JOB_JSON }} --location us-west1

- name: Post to a pudl-deployments channel
id: slack
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ jobs:
run: >-
gh release create '${{ github.ref_name }}' ./dist/*.tar.gz ./dist/*.whl
--title 'PUDL ${{ github.ref_name }}'
--discussion-category Announcements
--generate-notes
--repo '${{ github.repository }}'
- name: Tag the current stable commit
Expand Down
4 changes: 2 additions & 2 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
PUDL Release Notes
=======================================================================================

.. _release-v2024.02.04:
.. _release-v2024.02.05:

---------------------------------------------------------------------------------------
v2024.02.04
v2024.02.05
---------------------------------------------------------------------------------------

This release contains only minor data updates compared to what we put out in December,
Expand Down

0 comments on commit dc55ddc

Please sign in to comment.