github action - test wildcard logic

techknowlogick · Feb 5, 2021 · 0f02d57 · 0f02d57
1 parent cb8fdd9
commit 0f02d57
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
@@ -6,7 +6,7 @@ on:
     - main
 
 jobs:
-  test:
+  build:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/test_pr.yml b/.github/workflows/test_pr.yml
@@ -13,11 +13,23 @@ jobs:
           fetch-depth: 2
       - name: get golang version 1
         run: |
-          echo ::set-output name=value::$(cat .golang_version | awk -F',' '{print $1}' | sed 's/go1/go-1/')
+          export VERSION=$(cat .golang_version | awk -F',' '{print $1}' | sed 's/go1/go-1/')
+          echo ::set-output name=value::$VERSION
+          DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
+          if [ "$DOTS" == "1" ]; then
+            echo ::set-output name=wildcard::$VERSION.x
+          else
+            echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
         id: golang_version_1
       - name: get golang version 2
         run: |
-          echo ::set-output name=value::$(cat .golang_version | awk -F',' '{print $2}' | sed 's/go1/go-1/')
+          export VERSION=$(cat .golang_version | awk -F',' '{print $2}' | sed 's/go1/go-1/')
+          echo ::set-output name=value::$VERSION
+          DOTS=$(echo -n $VERSION | awk -F"." '{print NF-1}')
+          if [ "$DOTS" == "1" ]; then
+            echo ::set-output name=wildcard::$VERSION.x
+          else
+            echo ::set-output name=wildcard::$(echo -n $VERSION | sed 's/\.[^.]*$/.x/')
         id: golang_version_2
       - name: get if base should be built
         run: |
@@ -37,14 +49,14 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: docker/${{ steps.golang_version_1.outputs.value }}/
-          tags: techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }}
+          tags: techknowlogick/xgo:${{ steps.golang_version_1.outputs.value }},techknowlogick/xgo:${{ steps.golang_version_1.outputs.wildcard }}
           push: false
           file: docker/${{ steps.golang_version_1.outputs.value }}/Dockerfile
       - name: build golang ${{ steps.golang_version_2.outputs.value }} image
         uses: docker/build-push-action@v2
         with:
           context: docker/${{ steps.golang_version_2.outputs.value }}/
-          tags: techknowlogick/xgo${{ steps.golang_version_2.outputs.value }}
+          tags: techknowlogick/xgo:${{ steps.golang_version_2.outputs.value }},techknowlogick/xgo:${{ steps.golang_version_2.outputs.wildcard }}
           push: false
           file: docker/${{ steps.golang_version_2.outputs.value }}/Dockerfile
       - name: TODO tests