Merge pull request #65 from planetf1/workflow

odpi · Mar 28, 2023 · 2786fb7 · 2786fb7
2 parents de6a3f2 + 8fc17a4
commit 2786fb7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -63,14 +63,14 @@ jobs:
         run: |
           echo "CONNECTOR_VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV
           echo "EGERIA_BASE_IMAGE=quay.io/odpi/egeria" >> $GITHUB_ENV
-          echo "EGERIA_VERSION=$(./gradlew dependencies | grep org.odpi.egeria:open-connector-framework | awk -F':' '{print $3}' | awk -F' ' '{print $1}' | uniq| head -1)" >> $GITHUB_ENV
+          echo "EGERIA_VERSION=$(./gradlew dependencies | grep org.odpi.egeria:open-connector-framework | awk -F':' '{if ($3) print $3}' | awk -F' ' '{print $1}' | uniq| head -1)" >> $GITHUB_ENV
       - name: Build and push to quay.io and docker.io (tag latest only for main!)
         if: ${{ github.ref == 'refs/heads/main'}}
         uses: docker/build-push-action@v3
         with:
           context: .
           push: true
-          tags: odpi/egeria:${{ env.CONNECTOR_VERSION }}, odpi/egeria:latest, quay.io/odpi/egeria-connector-integration-topic-strimzi:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-integration-topic-strimzi:latest
+          tags: odpi/egeria-connector-integration-topic-strimzi:${{ env.CONNECTOR_VERSION }}, odpi/egeria-connector-integration-topic-strimzi:latest, quay.io/odpi/egeria-connector-integration-topic-strimzi:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-integration-topic-strimzi:latest
           platforms: linux/amd64,linux/arm64
           build-args: |
             EGERIA_BASE_IMAGE=${{ env.EGERIA_BASE_IMAGE }}
@@ -82,7 +82,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: odpi/egeria:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-integration-topic-strimzi:${{ env.CONNECTOR_VERSION }}
+          tags: odpi/egeria-connector-integration-topic-strimzi:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-integration-topic-strimzi:${{ env.CONNECTOR_VERSION }}
           platforms: linux/amd64,linux/arm64
           build-args: |
             EGERIA_BASE_IMAGE=${{ env.EGERIA_BASE_IMAGE }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -57,13 +57,13 @@ jobs:
         run: |
           echo "CONNECTOR_VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep '^version:' | awk '{printf $2}')" >> $GITHUB_ENV
           echo "EGERIA_BASE_IMAGE=quay.io/odpi/egeria" >> $GITHUB_ENV
-          echo "EGERIA_VERSION=$(./gradlew dependencies | grep org.odpi.egeria:open-connector-framework | awk -F':' '{print $3}' | awk -F' ' '{print $1}' | uniq| head -1)" >> $GITHUB_ENV
+          echo "EGERIA_VERSION=$(./gradlew dependencies | grep org.odpi.egeria:open-connector-framework | awk -F':' '{if ($3) print $3}' | awk -F' ' '{print $1}' | uniq| head -1)" >> $GITHUB_ENV
       - name: Build and push( to quay.io and docker.io (no tag latest)
         uses: docker/build-push-action@v3
         with:
           context: .
           push: true
-          tags: odpi/egeria:${{ env.VERSION }}, quay.io/odpi/egeria-connector-integration-topic-strimzi:${{ env.VERSION }}
+          tags: odpi/egeria-connector-integration-topic-strimzi:${{ env.VERSION }}, quay.io/odpi/egeria-connector-integration-topic-strimzi:${{ env.VERSION }}
           platforms: linux/amd64,linux/arm64
           build-args: |
             EGERIA_BASE_IMAGE=${{ env.EGERIA_BASE_IMAGE }}