ci: Use Go version from go.mod for both release and scanning

rancher · Oct 9, 2024 · 9f36f72 · 9f36f72
1 parent 2503306
commit 9f36f72
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -43,6 +43,11 @@ jobs:
       with:
         fetch-depth: 0
         ref: ${{ github.ref_name}}
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: 'go.mod'
+        check-latest: true
     - name: Build and push all image variations
       run: |
         make operator

diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml
@@ -1,9 +1,11 @@
 name: Scan
 on:
   pull_request:
+    branches:
+      - release-v2.7
   push:
     branches:
-      - master
+      - release-v2.7
     tags:
       - "v*"
 jobs:
@@ -14,6 +16,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+      - name: Build operator
+        run: make operator
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2.9.1
@@ -24,7 +33,7 @@ jobs:
           tags: ghcr.io/rancher/aks-operator:${{ github.sha }}
           load: true
           push: false
-          file: test/e2e/Dockerfile.e2e
+          file: package/Dockerfile
           build-args: |
             TAG=${{ github.sha }}
             REPO=ghcr.io/rancher/aks-operator