Add gha

Signed-off-by: Matthew DeVenny <[email protected]>
boxboat · Oct 2, 2024 · a2e74dd · a2e74dd
1 parent b573fa3
commit a2e74dd
Showing 1 changed file with 29 additions and 27 deletions.
diff --git a/.github/workflows/image-update.yaml b/.github/workflows/image-update.yaml
@@ -60,32 +60,6 @@ jobs:
           # calculate checksum
           checksum=$(envsubst '${repo_digest}' < ./cicd/checksum/Dockerfile | sha256sum | cut -d' ' -f1)
           echo "checksum=${checksum}" >> $GITHUB_OUTPUT
-          # calculate versions
-          versions=($(git ls-remote --tags "${{matrix.image.repo}}" \
-            | sed -r -n 's|.*refs/tags/v?(.*)$|\1|p' \
-            | xargs semver -r "${{ matrix.image.semverRange}}"))
-          IFS=$'\n'
-          size=${#versions[@]}
-          echo $size
-          
-          jsonVersions="["
-          for i in "${!versions[@]}"; do
-            # check to see if version is available for download and skip if not
-            download_test_version=$(echo '${{matrix.image.check}}' | VERSION="${versions[$i]}" envsubst '${VERSION}')
-            download_test_response=$(curl -SsLI "$download_test_version" -w "%{http_code}" -o /dev/null)
-            if [ "$download_test_response" = "404" ]; then
-              echo "$download_test_version - failed; skipping" >&2
-              continue
-            fi
-            jsonVersions="${jsonVersions}{'command':'${{matrix.image.command}}', 'version':'${versions[$i]}'}"
-            if (( $i < ($size-1) )); then
-              jsonVersions="${jsonVersions},"
-            fi
-          done
-          jsonVersions="${jsonVersions}]"
-          echo ${jsonVersions}
-          echo "versions=${jsonVersions}" >> $GITHUB_OUTPUT
-          echo "latest=${versions[$((size-1))]}" >> $GITHUB_OUTPUT
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -130,6 +104,33 @@ jobs:
           # calculate digest
           digest=$(regctl manifest digest ghcr.io/boxboat/${{matrix.image.command }}:checksum)
           echo "digest=ghcr.io/boxboat/${{matrix.image.command }}@${digest}" >> $GITHUB_OUTPUT
+          
+          # calculate versions
+          versions=($(git ls-remote --tags "${{matrix.image.repo}}" \
+            | sed -r -n 's|.*refs/tags/v?(.*)$|\1|p' \
+            | xargs semver -r "${{ matrix.image.semverRange}}"))
+          IFS=$'\n'
+          size=${#versions[@]}
+          echo $size
+          
+          jsonVersions="["
+          for i in "${!versions[@]}"; do
+            # check to see if version is available for download and skip if not
+            download_test_version=$(echo '${{matrix.image.check}}' | VERSION="${versions[$i]}" envsubst '${VERSION}')
+            download_test_response=$(curl -SsLI "$download_test_version" -w "%{http_code}" -o /dev/null)
+            if [ "$download_test_response" = "404" ]; then
+              echo "$download_test_version - failed; skipping" >&2
+              continue
+            fi
+            jsonVersions="${jsonVersions}{'command':'${{matrix.image.command}}', 'version':'${versions[$i]}', 'digest':'$digest', 'checksum':'${{ steps.baseImage.outputs.checksum }}'}"
+            if (( $i < ($size-1) )); then
+              jsonVersions="${jsonVersions},"
+            fi
+          done
+          jsonVersions="${jsonVersions}]"
+          echo ${jsonVersions}
+          echo "versions=${jsonVersions}" >> $GITHUB_OUTPUT
+          echo "latest=${versions[$((size-1))]}" >> $GITHUB_OUTPUT
 
       # use GoCodeAlone fork - until cloudposse fixes
       # https://github.com/cloudposse/github-action-matrix-outputs-read/issues/29
@@ -166,7 +167,6 @@ jobs:
           echo $istioctl >> ./versions.json
           echo $lego >> ./versions.json
           
-          jq --version
           versions=$(jq -c -s 'add' ./versions.json)
           echo "versions=${versions}" >> $GITHUB_OUTPUT
     outputs:
@@ -183,6 +183,8 @@ jobs:
       - run: |
           echo ${{ matrix.image.command }}
           echo ${{ matrix.image.version }}
+          echo ${{ matrix.image.digest }}
+          echo ${{ matrix.image.checksum }}
 #      - uses: actions/checkout@v4
 #
 #      - name: Login to DockerHub