From 3ed19679928b7df896b51f48e03bd5b1d0d9c43e Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Wed, 30 Nov 2022 14:32:03 +0000
Subject: [PATCH] actions: use go-version-file: .go-version (#2142)

see https://github.com/actions/setup-go/pull/295

(cherry picked from commit cf5c762dcd9e91e549e86f034057c4318a29092b)

# Conflicts:
#	.github/workflows/golangci-lint.yml
---
 .github/workflows/golangci-lint.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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