From 31ab4ed129f270adf6da0b8fc0231309a722827e Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 13 Aug 2025 23:03:20 -0700
Subject: [PATCH 1/2] ci: bumps and nits

This upgrades some CI components:
 - various github actions used for CI
 - golangci-lint
 - go (removed 1.23.x, added 1.25.x)

In addition to that,
 - make sure latest Go is used for linting action;
 - drop master branch from jobs as we don't have it.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .github/workflows/test.yml     |  5 ++---
 .github/workflows/validate.yml | 12 +++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6be0c82..15430e7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,6 @@ on:
       - v*
     branches:
       - main
-      - master
       - release-*
   pull_request:
 
@@ -15,13 +14,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.23.x, 1.24.x]
+        go-version: [1.24.x, 1.25.x]
         libseccomp: ["v2.3.3", "v2.4.4", "v2.5.6", "v2.6.0", "HEAD"]
 
     steps:
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: build libseccomp ${{ matrix.libseccomp }}
       run: |
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index f6c5b32..f40656a 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -4,7 +4,6 @@ on:
     tags:
       - v*
     branches:
-      - master
       - main
       - release-*
   pull_request:
@@ -14,19 +13,22 @@ jobs:
   lint:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 1.25.x
       - name: install deps
         run: |
           sudo apt -q update
           sudo apt -q install libseccomp-dev
-      - uses: golangci/golangci-lint-action@v7
+      - uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.1
+          version: v2.4
 
   codespell:
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: install deps
       # Version of codespell bundled with Ubuntu will become old, so use pip.
       # OTOH, we want to pin it to specific version to avoid breaking CI.

From 7871566d74241cc3a7c0d5eeff35cf751a8678a7 Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 13 Aug 2025 23:10:27 -0700
Subject: [PATCH 2/2] ci: add an ARM run

For some time, ARM64 is available for GHA, let's make use of it.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .github/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 15430e7..9575b0f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,12 +10,14 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
         go-version: [1.24.x, 1.25.x]
         libseccomp: ["v2.3.3", "v2.4.4", "v2.5.6", "v2.6.0", "HEAD"]
+        os: [ubuntu-24.04, ubuntu-24.04-arm]
+
+    runs-on: ${{ matrix.os }}
 
     steps: