Merge pull request #110 from kolyshkin/ci-bumps

CI bumps

Signed-off-by: Kir Kolyshkin <[email protected]>
Acked-by: Tom Hromatka <[email protected]>

Author: kolyshkin

.github/workflows/test.yml

@@ -11,22 +11,17 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.19.x, 1.20.x]
-        libseccomp: ["v2.3.3", "v2.4.3", "v2.5.4", "HEAD"]
+        go-version: [1.22.x, 1.23.x]
+        libseccomp: ["v2.3.3", "v2.4.4", "v2.5.5", "HEAD"]
 
     steps:
 
     - name: checkout
-      uses: actions/checkout@v3
-
-    - name: install go ${{ matrix.go-version }}
-      uses: actions/setup-go@v3
-      with:
-        go-version: ${{ matrix.go-version }}
+      uses: actions/checkout@v4
 
     - name: build libseccomp ${{ matrix.libseccomp }}
       run: |
@@ -69,6 +64,17 @@ jobs:
         # For TestExpectedSeccompVersion.
         echo "_EXPECTED_LIBSECCOMP_VERSION=$VER" >> $GITHUB_ENV
 
+    - name: install go ${{ matrix.go-version }}
+      uses: actions/setup-go@v5
+      with:
+        go-version: ${{ matrix.go-version }}
+        # Add libseccomp.pc path so that setup-go adds this file hash to cache key.
+        # This way, we'll have different caches for different libseccomp versions.
+        cache-dependency-path: |
+          go.sum
+          ${{ env.PKG_CONFIG_LIBDIR }}/libseccomp.pc
+
+
     - name: build
       run: make check-build
 

.github/workflows/validate.yml

@@ -12,23 +12,24 @@ on:
 jobs:
 
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: install deps
         run: |
           sudo apt -q update
           sudo apt -q install libseccomp-dev
-      - uses: golangci/golangci-lint-action@v3
+      - uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.51
+          version: v1.60
 
   codespell:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: install deps
-      # Version of codespell bundled with Ubuntu is way old, so use pip.
-      run: pip install codespell
+      # 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.
+      run: pip install --break-system-packages codespell==v2.3.0
     - name: run codespell
       run: codespell