From 3e3c2de914290d3239ec7b871e88d54a8fd833ab Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 24 Sep 2024 10:52:04 -0700 Subject: [PATCH 1/2] APIGOV-28869 - fix grep --- .github/workflows/build-docker-images.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index 25971ca..1820c77 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -27,12 +27,9 @@ jobs: id: vars working-directory: discovery run: | - pwd echo "date=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT echo "tag=${{github.ref_name }}" >> $GITHUB_OUTPUT - echo "sdkversion=$(grep github.com/Axway/agent-sdk go.mod | awk '{print $2}')" - echo "now ${{ steps.vars.outputs.sdkversion }}" - echo "sdkversion=$(grep github.com/Axway/agent-sdk go.mod | awk '{print $2}')" >> $GITHUB_OUTPUT + echo "sdkversion=$(grep -Eo "^\s]+github.com/Axway/agent-sdk go.mod | awk '{print $2}')" >> $GITHUB_OUTPUT echo "commit=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT - name: Log in to the Container registry From d95ae4b04f8adc85b87595987c953d615df35e63 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 24 Sep 2024 10:53:03 -0700 Subject: [PATCH 2/2] APIGOV-28869 - fix --- .github/workflows/build-docker-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index 1820c77..1bb3255 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -29,7 +29,7 @@ jobs: run: | echo "date=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT echo "tag=${{github.ref_name }}" >> $GITHUB_OUTPUT - echo "sdkversion=$(grep -Eo "^\s]+github.com/Axway/agent-sdk go.mod | awk '{print $2}')" >> $GITHUB_OUTPUT + echo "sdkversion=$(grep -Eo "^[\s]+github.com/Axway/agent-sdk go.mod | awk '{print $2}')" >> $GITHUB_OUTPUT echo "commit=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT - name: Log in to the Container registry