Update with review feedback

Deltares · Jun 27, 2024 · 2cd38be · 2cd38be
1 parent 533ef74
commit 2cd38be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
@@ -14,6 +14,7 @@ on:
         default: false
         type: string
   workflow_dispatch:
+  push:
 
 env:
   REGISTRY: ghcr.io
@@ -42,11 +43,11 @@ jobs:
         with:
           poetry-version: 1.4.2
       - name: Get current version
+        id: get-version
         if: ${{ env.PROJECT_VERSION }} == false
         run: |
           PROJECT_VERSION=$(poetry version --short)
-          echo "PROJECT_VERSION=$PROJECT_VERSION" >> $GITHUB_ENV
-
+          echo "PROJECT_VERSION=$PROJECT_VERSION" >> $GITHUB_OUTPUT
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -60,4 +61,4 @@ jobs:
           push: true
           tags: |
               ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.project_version || env.PROJECT_VERSION }}
+              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.project_version || steps.get-version.outputs.PROJECT_VERSION }}
diff --git a/.github/workflows/version_upgrade.yml b/.github/workflows/version_upgrade.yml
@@ -41,13 +41,12 @@ jobs:
           git config user.email github-actions@github.com
           poetry version ${{ inputs.release_type }}
           PROJECT_VERSION=$(poetry version --short)
-          echo "PROJECT_VERSION=$PROJECT_VERSION" >> $GITHUB_ENV
           echo "PROJECT_VERSION=$PROJECT_VERSION" >> $GITHUB_OUTPUT
           sed -i "1 s/.*/version: $PROJECT_VERSION/" template_input.yaml
       - name: commit changes
         run: |
           PROJECT_VERSION=$(poetry version --short)
           git add template_input.yaml
           git add pyproject.toml
-          git commit -m "bump ${{ inputs.release_type }} version: $PROJECT_VERSION"
+          git commit -m "bump ${{ inputs.release_type }} version: ${{ steps.get-version.outputs.PROJECT_VERSION }}"
           git push