diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 6bd6da63f..71c6dde65 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -15,16 +15,20 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
+<<<<<<< HEAD
       - uses: actions/checkout@v2
+=======
+      - name: Echo details
+        env:
+          GOOS: ${{ matrix.GOOS }}
+        run: echo Go GOOS=$GOOS
 
-      # Uses Go version from the repository.
-      - name: Read .go-version file
-        id: goversion
-        run: echo "::set-output name=version::$(cat .go-version)"
+      - uses: actions/checkout@v3
+>>>>>>> cf5c762 (actions: use go-version-file: .go-version (#2142))
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: "${{ steps.goversion.outputs.version }}"
+          go-version-file: .go-version
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2