Merge pull request #114 from uptane/chore/bump-docker

Move CI from old Ubuntu images to Debian
uptane · Aug 20, 2024 · ada682b · ada682b
2 parents 80a777d + 80d3af7
commit ada682b
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 815 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,17 +8,14 @@ env:
   CCACHE_DIR: ${{ github.workspace }}/.ccache
 jobs:
   coverage:
-    name: Coverage on Ubuntu Bionic
+    name: Build and Test on Debian Bullseye
     runs-on: ubuntu-latest
     env:
-      DOCKER_TAG: docker.pkg.github.com/uptane/aktualizr/aktualizr-ci:bionic-master
-      DOCKERFILE: docker/Dockerfile.ubuntu.bionic
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      DOCKER_TAG: docker.pkg.github.com/uptane/aktualizr/aktualizr-ci:bullseye-master
+      DOCKERFILE: docker/Dockerfile.debian.bullseye
       DARGS: >-
         -eCCACHE_DIR
-        -eCODECOV_TOKEN
         -eTEST_CMAKE_BUILD_TYPE=Valgrind
-        -eTEST_WITH_COVERAGE=1
         -eTEST_WITH_P11=1
         -eTEST_WITH_FAULT_INJECTION=1
         -eTEST_TESTSUITE_EXCLUDE=credentials
@@ -35,26 +32,33 @@ jobs:
         run: |
           docker pull "$DOCKER_TAG" || true
           docker build --cache-from "$DOCKER_TAG" --pull -t "$DOCKER_TAG" -f "$DOCKERFILE" .
-      - uses: actions/cache@v1.1.0
+      - uses: actions/cache@v4
         with:
-          path: ${{ github.workspace }}/.ccache
-          key: ubuntu-bionic-${{ github.run_id }}
+          path: ${{ github.workspace }}/cache
+          key: debian-bullseye-${{ github.run_id }}
           restore-keys: |
-            ubuntu-bionic-${{ github.run_id }}
-            ubuntu-bionic-
+            debian-bullseye-${{ github.run_id }}
+            debian-bullseye-
+      - name: Unpack ccache
+        run: docker run --mount=type=volume,source=ccache,destination=/home/testuser/.cache -i "$DOCKER_TAG" tar -xf- < ${{github.workspace}}/cache/cache.tar || echo "No cache found"
       - name: Test
-        run: docker run -v "$PWD:$PWD" -w "$PWD" $DARGS -t "$DOCKER_TAG" ./scripts/test.sh
+        run: |
+          docker run --mount=type=volume,source=ccache,destination=/home/testuser/.cache  -t "$DOCKER_TAG" source/scripts/build-and-test.sh
+      - name: Stash ccache
+        run: |
+          mkdir -p ${{github.workspace}}/cache
+          docker run --mount=type=volume,source=ccache,destination=/home/testuser/.cache -i "$DOCKER_TAG" tar -cf- .cache > ${{github.workspace}}/cache/cache.tar
 
   nop11:
-    name: Tests without p11 support on Ubuntu Bionic
+    name: Tests with PKCS#11 support on Ubuntu Bionic
     runs-on: ubuntu-latest
     env:
       DOCKER_TAG: docker.pkg.github.com/uptane/aktualizr/aktualizr-ci:bionic-master
       DOCKERFILE: docker/Dockerfile.ubuntu.bionic
       DARGS: >-
         -eCCACHE_DIR
         -eTEST_CMAKE_BUILD_TYPE=Debug
-        -eTEST_WITH_P11=0
+        -eTEST_WITH_P11=1
         -eTEST_WITH_TESTSUITE=0
     steps:
       - uses: actions/checkout@main