Address review comments

eclipse-velocitas · Jun 25, 2024 · 2379d5a · 2379d5a
1 parent 5b9f362
commit 2379d5a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/app/workflows/gen-desired-state.yml b/src/app/workflows/gen-desired-state.yml
@@ -42,10 +42,11 @@ jobs:
           velocitas init -v
 
       - name: Extract version from tag
+        id: get_version
         run: |
           VERSION=${GITHUB_REF_NAME#v}
           echo Version: $VERSION
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "version-without-v=$VERSION" >> $GITHUB_OUTPUT
 
       - id: github-repository-name-case-adjusted
         name: Prepare repository name in lower case for docker upload.
@@ -56,7 +57,7 @@ jobs:
       - name: "Generate desired state for ${{ inputs.app_name }}"
         working-directory: ${{github.workspace}}
         env:
-          VAPP_VERSION: ${{ env.VERSION }}
+          VAPP_VERSION: ${{ steps.get_version.outputs.version-without-v }}
           REGISTRY: "ghcr.io/${{steps.github-repository-name-case-adjusted.outputs.lowercase}}"
         run: |
           velocitas exec pantaris-integration generate-desired-state -s $(echo $REGISTRY/${{ inputs.app_name }}:$VAPP_VERSION | tr '[:upper:]' '[:lower:]')

diff --git a/src/common/workflows/check-licenses.yml b/src/common/workflows/check-licenses.yml
@@ -25,9 +25,6 @@ on:
   pull_request:
     branches:
       - main
-  push:
-    branches:
-      - main
 
 jobs:
   check-licenses:

diff --git a/src/cpp-app/workflows/release.yml b/src/cpp-app/workflows/release.yml
@@ -59,12 +59,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Extract version from tag
+        id: get_version
         run: |
           VERSION=${GITHUB_REF_NAME#v}
           echo Version: $VERSION
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "version-without-v=$VERSION" >> $GITHUB_OUTPUT
 
-      - run: echo "Using VehicleApp version ${{ env.VERSION }} from tag"
+      - run: echo "Using VehicleApp version ${{ steps.get_version.outputs.version-without-v }} from tag"
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -106,7 +107,7 @@ jobs:
         env:
           VAPP_IMAGE: ${{ env.APP_NAME }}-multiarch-oci-archive/${{ env.APP_NAME }}-oci-multiarch.tar
           VAPP_NAME: ${{ env.APP_NAME }}
-          VAPP_VERSION: ${{ env.VERSION }}
+          VAPP_VERSION: ${{ steps.get_version.outputs.version-without-v }}
           REGISTRY: "ghcr.io/${{steps.github-repository-name-case-adjusted.outputs.lowercase}}"
         run: |
           tag=$(echo docker://$REGISTRY/$VAPP_NAME:$VAPP_VERSION | tr '[:upper:]' '[:lower:]')

diff --git a/src/python-app/workflows/release.yml b/src/python-app/workflows/release.yml
@@ -59,12 +59,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Extract version from tag
+        id: get_version
         run: |
           VERSION=${GITHUB_REF_NAME#v}
           echo Version: $VERSION
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "version-without-v=$VERSION" >> $GITHUB_OUTPUT
 
-      - run: echo "Using VehicleApp version ${{ env.VERSION }} from tag"
+      - run: echo "Using VehicleApp version ${{ steps.get_version.outputs.version-without-v }}  from tag"
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -101,7 +102,7 @@ jobs:
         env:
           VAPP_IMAGE: ${{ env.APP_NAME }}-multiarch-oci-archive/${{ env.APP_NAME }}-oci-multiarch.tar
           VAPP_NAME: ${{ env.APP_NAME }}
-          VAPP_VERSION: ${{ env.VERSION }} 
+          VAPP_VERSION: ${{ steps.get_version.outputs.version-without-v }}
           REGISTRY: "ghcr.io/${{steps.github-repository-name-case-adjusted.outputs.lowercase}}"
         run: |
           tag=$(echo docker://$REGISTRY/$VAPP_NAME:$VAPP_VERSION | tr '[:upper:]' '[:lower:]')