From 2820343d4742b7816b221d74cdc784e881547937 Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Wed, 7 Feb 2024 12:36:23 -0800 Subject: [PATCH] Update workflow files to install Go via composite action Signed-off-by: Maksym Pavlenko --- .github/workflows/build-test-images.yml | 6 ++---- .github/workflows/codeql.yml | 4 +--- .github/workflows/fuzz.yml | 4 +--- .github/workflows/images.yml | 6 ++---- .github/workflows/nightly.yml | 15 ++++----------- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-test-images.yml b/.github/workflows/build-test-images.yml index fd80bdfc0..379f2cf92 100644 --- 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.21.6" - - 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 index 910c4d3f7..9777e87c5 100644 --- 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.21.6 + - 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 index e318a8f74..598a441b4 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -40,8 +40,6 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/setup-go@v5 - with: - go-version: 1.21.x - 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 index 5c19e6600..b39174a7a 100644 --- 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.21.6" - - 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 index 7407aca3a..288b5df21 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -6,9 +6,6 @@ on: paths: - ".github/workflows/nightly.yml" -env: - GO_VERSION: "1.21.6" - 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: |