Install dependencies in release.yaml (#3)

* Install dependencies in release.yaml

* Use matrix

* Use wildcard for file names instead of hardcoding them

* Enable ARM builds

* Use version specified by the actions job

Author: divolgin

.github/workflows/pr-validation.yml

@@ -43,8 +43,8 @@ jobs:
         include:
           - arch: x86_64
             runner: ubuntu-22.04
-          # - arch: aarch64
-          #   runner: ARM64-CMX
+          - arch: aarch64
+            runner: ubuntu-22.04-arm
 
     steps:
     - name: Checkout code

.github/workflows/release.yml

@@ -6,45 +6,38 @@ on:
       - "v*"
 
 jobs:
-  build-x86_64:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - run: git config --global --add safe.directory $(pwd) # Workaround for fatal: detected dubious ownership in repository at '/__w/reliability-matrix/reliability-matrix'
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-      - run: make generate build VERSION=${{ github.ref_name }}
-      - run: mv ./pktstat-bpf ./pktstat-bpf-x86_64
-      - name: Upload x86_64 binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: pktstat-bpf-x86_64
-          path: ./pktstat-bpf-x86_64
-
-  build-aarch64:
-    runs-on: ARM64-CMX
+  build:
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+            runner: ubuntu-22.04
+          - arch: aarch64
+            runner: ubuntu-22.04-arm
+    runs-on: ${{ matrix.runner }}
     steps:
       - uses: actions/checkout@v4
       - run: git config --global --add safe.directory $(pwd) # Workaround for fatal: detected dubious ownership in repository at '/__w/reliability-matrix/reliability-matrix'
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang llvm libbpf-dev
       - run: make generate build VERSION=${{ github.ref_name }}
-      - run: mv ./pktstat-bpf ./pktstat-bpf-aarch64
-      - name: Upload aarch64 binary
+      - run: mv ./pktstat-bpf ./pktstat-bpf-${{ matrix.arch }}
+      - name: Upload ${{ matrix.arch }} binary
         uses: actions/upload-artifact@v4
         with:
-          name: pktstat-bpf-aarch64
-          path: ./pktstat-bpf-aarch64
+          name: pktstat-bpf-${{ matrix.arch }}
+          path: ./pktstat-bpf-${{ matrix.arch }}
 
   create-release:
     runs-on: ubuntu-22.04
     needs:
-      - build-x86_64
-      - build-aarch64
+      - build
     steps:
       - uses: actions/checkout@v4
       - name: Download x86_64 binary
@@ -58,6 +51,7 @@ jobs:
           name: pktstat-bpf-aarch64
           path: ./bin
       - name: Create GitHub Release
-        run: gh release create ${{ github.ref_name }} ./bin/pktstat-bpf-x86_64 ./bin/pktstat-bpf-aarch64 --generate-notes
+        run: |
+          gh release create ${{ github.ref_name }} ./bin/pktstat-bpf-* --generate-notes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -1,8 +1,8 @@
 # Variables
 TARGET := pktstat-bpf
-GIT_LAST_TAG := $(shell git describe --abbrev=0 --tags 2>/dev/null || echo latest)
+VERSION ?= $(shell git describe --abbrev=0 --tags 2>/dev/null || echo latest)
 GIT_HEAD_COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null || echo unknown)
-GIT_TAG_COMMIT := $(shell git rev-parse --short $(GIT_LAST_TAG) 2>/dev/null || echo unknown)
+GIT_TAG_COMMIT := $(shell git rev-parse --short $(VERSION) 2>/dev/null || echo unknown)
 GIT_MODIFIED1 := $(shell git diff $(GIT_HEAD_COMMIT) $(GIT_TAG_COMMIT) --quiet 2>/dev/null || echo .dev)
 GIT_MODIFIED2 := $(shell git diff --quiet 2>/dev/null || echo .dirty)
 GIT_MODIFIED := $(GIT_MODIFIED1)$(GIT_MODIFIED2)
@@ -18,4 +18,4 @@ generate:
 	go generate
 
 build:
-	go build -trimpath -pgo=auto -ldflags="-s -w -X main.GitTag=$(GIT_LAST_TAG) -X main.GitCommit=$(GIT_HEAD_COMMIT) -X main.GitDirty=$(GIT_MODIFIED) -X main.BuildTime=$(BUILD_DATE)" -o $(TARGET) 
+	go build -trimpath -pgo=auto -ldflags="-s -w -X main.GitTag=$(VERSION) -X main.GitCommit=$(GIT_HEAD_COMMIT) -X main.GitDirty=$(GIT_MODIFIED) -X main.BuildTime=$(BUILD_DATE)" -o $(TARGET)