From 91a3b275e80ad7bb38ab8ea97ed93abbdac9a057 Mon Sep 17 00:00:00 2001
From: Maximiliano Osorio <maxiosorio@gmail.com>
Date: Wed, 31 May 2023 19:30:34 -0400
Subject: [PATCH 1/2] support: arm64

---
 .github/workflows/docker-publish.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 7d8e79f..23a10a8 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -69,6 +69,12 @@ jobs:
         run: |
           echo "::set-output name=docker_tag::${{ env.DOCKER_TAG }}"
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -93,7 +99,7 @@ jobs:
           tags: ${{ env.DOCKER_IMAGE_REPOSITORY }}/${{ env.DOCKER_IMAGE_NAME }}:latest
           file: ${{ env.DOCKER_FILE}}
           platforms: linux/amd64,linux/arm64
-          
+
   update:
     needs: push
     runs-on: ubuntu-latest
@@ -120,12 +126,11 @@ jobs:
         if: github.ref == 'refs/heads/master'
         with:
           repository: mintproject/mint
-          path: mint-chart 
+          path: mint-chart
           token: ${{ secrets.MINT_INSTANCES }}
           ref: main
 
-
-      - name: Update MINT ISI master 
+      - name: Update MINT ISI master
         uses: fjogeleit/yaml-update-action@main
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
@@ -135,10 +140,10 @@ jobs:
           message: "Update Image Version to ${{ env.DOCKER_TAG }}"
           repository: mintproject/mint-instances
           workDir: infrastructure
-          branch: master 
+          branch: master
           token: ${{ secrets.MINT_INSTANCES }}
 
-      - name: Update MINT ISI WIFIRE 
+      - name: Update MINT ISI WIFIRE
         uses: fjogeleit/yaml-update-action@main
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
@@ -148,11 +153,10 @@ jobs:
           message: "Update UI"
           repository: mintproject/mint-instances
           workDir: infrastructure
-          branch: master 
+          branch: master
           token: ${{ secrets.MINT_INSTANCES }}
 
-
-      - name: Update MINT tacc 
+      - name: Update MINT tacc
         uses: fjogeleit/yaml-update-action@main
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         with:
@@ -162,7 +166,7 @@ jobs:
           message: "Update UI"
           repository: mintproject/mint-instances
           workDir: infrastructure
-          branch: master 
+          branch: master
           token: ${{ secrets.MINT_INSTANCES }}
 
       - name: Update MINT ISI dev
@@ -175,10 +179,9 @@ jobs:
           message: "Update UI"
           repository: mintproject/mint-instances
           workDir: infrastructure
-          branch: master 
+          branch: master
           token: ${{ secrets.MINT_INSTANCES }}
 
-
       - name: Update helm charts
         uses: fjogeleit/yaml-update-action@main
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
@@ -216,5 +219,4 @@ jobs:
         uses: github/codeql-action/upload-sarif@v1
         if: always()
         with:
-
           sarif_file: "trivy-results.sarif"

From c977e0844cd59538737a0e26c8adbb72aba6af6b Mon Sep 17 00:00:00 2001
From: Maximiliano Osorio <maxiosorio@gmail.com>
Date: Wed, 31 May 2023 19:34:25 -0400
Subject: [PATCH 2/2] fix: use codeql action v2

---
 .github/workflows/docker-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 23a10a8..b37ab4e 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -216,7 +216,7 @@ jobs:
           ignore-unfixed: "true"
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         if: always()
         with:
           sarif_file: "trivy-results.sarif"