refact: centralize Go version retrieval in Makefile

alegrey91 · Feb 11, 2025 · 27b18be · 27b18be
1 parent 22ebe1a
commit 27b18be
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Get Go version from go.mod
         id: get_go_version
         run: |
-          go_version=$(grep '^toolchain' go.mod | awk '{print $2}' | sed 's/go//')
+          go_version=$(make go-version)
       - name: Set up Go
         uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # ratchet:actions/setup-go@v5
         with:

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4
-      - name: Get Go version from go.mod
+      - name: Get Go version from Makefile
         id: get_go_version
         run: |
-          go_version=$(grep '^toolchain' go.mod | awk '{print $2}' | sed 's/go//')
+          go_version=$(make go-version)
       - name: Set up Go
         uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # ratchet:actions/setup-go@v5
         with:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/checkout@v4
-      - name: Get Go version from go.mod
+      - name: Get Go version from Make file
         id: get_go_version
         run: |
-          go_version=$(grep '^toolchain' go.mod | awk '{print $2}' | sed 's/go//')
+            go_version=$(make go-version)
       - name: Set up Go
         uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # ratchet:actions/setup-go@v5
         with:
@@ -58,7 +58,7 @@ jobs:
       - name: Get Go version from go.mod
         id: get_go_version
         run: |
-          go_version=$(grep '^toolchain' go.mod | awk '{print $2}' | sed 's/go//')
+          go_version=$(make go-version)
      
       - name: Set up Go
         uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # ratchet:actions/setup-go@v5
@@ -120,7 +120,7 @@ jobs:
       - name: Get Go version from go.mod
         id: get_go_version
         run: |
-          go_version=$(grep '^toolchain' go.mod | awk '{print $2}' | sed 's/go//')
+          go_version=$(make go-version)
       
       - name: Set up Go
         uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # ratchet:actions/setup-go@v5

diff --git a/Makefile b/Makefile
@@ -104,4 +104,7 @@ install:
 clean:
 	rm -rf ${OUTPUT_DIR}
 	rm -rf ${BINARY_DIR}
-	rm -rf ./libbpfgo
+	rm -rf ./libbpfgo
+
+go-version:
+	@grep '^toolchain' go.mod | awk '{print $$2}' | sed 's/go//'