From 35cb2494d5947a18f04d09f6538a3c2fb2c8dced Mon Sep 17 00:00:00 2001 From: Michel Loiseleur Date: Fri, 23 Aug 2024 09:11:03 +0200 Subject: [PATCH] fix ordering --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/lint.yaml | 13 +++++++------ .github/workflows/staging-image-tester.yaml | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7e3bef4b9..48fc93b06 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,15 +20,15 @@ jobs: runs-on: ubuntu-latest steps: + - name: Check out code into the Go module directory + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: Set up Go 1.x uses: actions/setup-go@v5 with: go-version-file: go.mod id: go - - name: Check out code into the Go module directory - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Install CI run: | go get -v -t -d ./... diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index c5cfdcdb2..72aa83d63 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -8,6 +8,7 @@ on: permissions: contents: read # to fetch code (actions/checkout) + checks: write jobs: @@ -20,16 +21,16 @@ jobs: runs-on: ubuntu-latest steps: + - name: Check out code into the Go module directory + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: Set up Go 1.x uses: actions/setup-go@v5 with: go-version-file: go.mod id: go - - name: Check out code into the Go module directory - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Lint - run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.1 - make lint + uses: golangci/golangci-lint-action@v6 + with: + version: v1.60 diff --git a/.github/workflows/staging-image-tester.yaml b/.github/workflows/staging-image-tester.yaml index 30493a803..dd3d5e450 100644 --- a/.github/workflows/staging-image-tester.yaml +++ b/.github/workflows/staging-image-tester.yaml @@ -20,15 +20,15 @@ jobs: runs-on: ubuntu-latest steps: + - name: Check out code into the Go module directory + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: Set up Go 1.x uses: actions/setup-go@v5 with: go-version-file: go.mod id: go - - name: Check out code into the Go module directory - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - name: Install CI run: | go get -v -t -d ./...