Update workflow files to install Go via composite action

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com> (cherry picked from commit 2820343) Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
containerd · Mar 1, 2024 · 6379dd6 · 6379dd6
1 parent a5c0d06
commit 6379dd6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 27 deletions.
diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml
@@ -41,14 +41,12 @@ jobs:
         working-directory: src/github.com/containerd/containerd
 
     steps:
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.20.13"
-
       - uses: actions/checkout@v4
         with:
           path: src/github.com/containerd/containerd
 
+      - uses: ./src/github.com/containerd/containerd/.github/actions/install-go
+
       - name: Set env
         shell: bash
         run: |

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -32,9 +32,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 1.20.13
+      - uses: ./.github/actions/install-go
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -40,10 +40,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - uses: actions/setup-go@v5
-        with:
-          # FIXME: go-fuzz fails with Go 1.20: `cgo_unix_cgo_res.cgo2.c:(.text+0x32): undefined reference to `__res_search'`
-          # https://github.com/containerd/containerd/pull/8103#issuecomment-1429256152
-          go-version: 1.18
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/install-go
       - run: script/go-test-fuzz.sh
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
@@ -26,14 +26,12 @@ jobs:
         working-directory: src/github.com/containerd/containerd
 
     steps:
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.20.13"
-
       - uses: actions/checkout@v4
         with:
           path: src/github.com/containerd/containerd
 
+      - uses: ./src/github.com/containerd/containerd/.github/actions/install-go
+
       - name: Set env
         shell: bash
         run: |

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -6,9 +6,6 @@ on:
     paths:
       - ".github/workflows/nightly.yml"
 
-env:
-  GO_VERSION: "1.20.13"
-
 permissions: # added using https://github.com/step-security/secure-workflows
   contents: read
 
@@ -23,14 +20,12 @@ jobs:
         working-directory: src/github.com/containerd/containerd
 
     steps:
-      - uses: actions/setup-go@v5
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
       - uses: actions/checkout@v4
         with:
           path: src/github.com/containerd/containerd
 
+      - uses: ./src/github.com/containerd/containerd/.github/actions/install-go
+
       - name: Set env
         shell: bash
         run: |
@@ -143,14 +138,12 @@ jobs:
         working-directory: src/github.com/containerd/containerd
 
     steps:
-      - uses: actions/setup-go@v5
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
       - uses: actions/checkout@v4
         with:
           path: src/github.com/containerd/containerd
 
+      - uses: ./src/github.com/containerd/containerd/.github/actions/install-go
+
       - name: Set env
         shell: bash
         run: |