From faf41f8b9eb4cdab1b35044d3f2a8fc54cf21402 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Thu, 20 Feb 2025 07:44:52 +0100 Subject: [PATCH] chore: use go-version-file to read .go-version Signed-off-by: Matthieu MOREL --- .github/workflows/benchmark-template.yaml | 4 +--- .github/workflows/failpoint_test.yaml | 4 +--- .github/workflows/robustness_template.yaml | 4 +--- .github/workflows/tests-template.yml | 4 +--- .github/workflows/tests_amd64.yaml | 4 +--- .github/workflows/tests_windows.yml | 8 ++------ 6 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.github/workflows/benchmark-template.yaml b/.github/workflows/benchmark-template.yaml index 460b6d5b7..148cb2638 100644 --- a/.github/workflows/benchmark-template.yaml +++ b/.github/workflows/benchmark-template.yaml @@ -24,11 +24,9 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: ${{ steps.goversion.outputs.goversion }} + go-version-file: .go-version - name: Run Benchmarks run: | BENCHSTAT_OUTPUT_FILE=result.txt make test-benchmark-compare REF=${{ inputs.benchGitRef }} diff --git a/.github/workflows/failpoint_test.yaml b/.github/workflows/failpoint_test.yaml index 994c76252..4b91912ac 100644 --- a/.github/workflows/failpoint_test.yaml +++ b/.github/workflows/failpoint_test.yaml @@ -10,11 +10,9 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: ${{ steps.goversion.outputs.goversion }} + go-version-file: .go-version - run: | make gofail-enable make test-failpoint diff --git a/.github/workflows/robustness_template.yaml b/.github/workflows/robustness_template.yaml index ba275fda0..2966dc53b 100644 --- a/.github/workflows/robustness_template.yaml +++ b/.github/workflows/robustness_template.yaml @@ -24,11 +24,9 @@ jobs: runs-on: ${{ fromJson(inputs.runs-on) }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: ${{ steps.goversion.outputs.goversion }} + go-version-file: .go-version - name: test-robustness run: | set -euo pipefail diff --git a/.github/workflows/tests-template.yml b/.github/workflows/tests-template.yml index 75adb91b4..54eb07aad 100644 --- a/.github/workflows/tests-template.yml +++ b/.github/workflows/tests-template.yml @@ -24,11 +24,9 @@ jobs: runs-on: ${{ inputs.runs-on }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: ${{ steps.goversion.outputs.goversion }} + go-version-file: .go-version - run: make fmt - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/tests_amd64.yaml b/.github/workflows/tests_amd64.yaml index f0201fc7e..1955aa5b3 100644 --- a/.github/workflows/tests_amd64.yaml +++ b/.github/workflows/tests_amd64.yaml @@ -18,9 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: ${{ steps.goversion.outputs.goversion }} + go-version-file: .go-version - run: make coverage diff --git a/.github/workflows/tests_windows.yml b/.github/workflows/tests_windows.yml index 8f7a4775e..6807b00e6 100644 --- a/.github/workflows/tests_windows.yml +++ b/.github/workflows/tests_windows.yml @@ -20,11 +20,9 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: ${{ steps.goversion.outputs.goversion }} + go-version-file: .go-version - run: make fmt - env: TARGET: ${{ matrix.target }} @@ -49,9 +47,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: - go-version: ${{ steps.goversion.outputs.goversion }} + go-version-file: .go-version - run: make coverage