Remove obsolete Dockerfiles, update tests

uraimo · Jan 27, 2024 · 0a55f93 · 0a55f93
1 parent 59a1b66
commit 0a55f93
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 92 deletions.
diff --git a/.github/workflows/advanced-example.yml b/.github/workflows/advanced-example.yml
@@ -4,15 +4,15 @@ on: [push, pull_request]
 jobs:
   build_job:
     # The host should always be linux
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     name: Build on ${{ matrix.distro }} ${{ matrix.arch }}
 
     # Run steps on a matrix of 4 arch/distro combinations
     strategy:
       matrix:
         include:
           - arch: aarch64
-            distro: ubuntu18.04
+            distro: ubuntu22.04
           - arch: ppc64le
             distro: alpine_latest
           - arch: riscv64
@@ -23,7 +23,7 @@ jobs:
             distro: archarm_latest
           - arch: none
             distro: none
-            base_image: ubuntu:18.04
+            base_image: ubuntu:22.04
 
     steps:
       - uses: actions/checkout@v3
@@ -63,7 +63,7 @@ jobs:
           # so update apt without checking the acutal base_image value.
           install: |
             case "${{ matrix.distro }}" in
-              ubuntu*|jessie|stretch|buster)
+              ubuntu*|jessie|stretch|buster|bullseye|bookworm)
                 apt-get update -q -y
                 apt-get install -q -y git
                 ;;

diff --git a/.github/workflows/basic-example.yml b/.github/workflows/basic-example.yml
@@ -4,16 +4,16 @@ on: [push, pull_request]
 jobs:
   armv7_job:
     # The host should always be linux
-    runs-on: ubuntu-18.04
-    name: Build on ubuntu-18.04 armv7
+    runs-on: ubuntu-22.04
+    name: Build on ubuntu-22.04 armv7
     steps:
       - uses: actions/checkout@v3
       - uses: uraimo/run-on-arch-action@v2
         name: Run commands
         id: runcmd
         with:
           arch: armv7
-          distro: ubuntu18.04
+          distro: ubuntu22.04
 
           # Not required, but speeds up builds
           githubToken: ${{ github.token }}

diff --git a/.github/workflows/swift-build.yml b/.github/workflows/swift-build.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,19 +18,19 @@ jobs:
           - arch: ppc64le
             distro: alpine_latest
           - arch: armv6
-            distro: buster
+            distro: bullseye
           - arch: armv7
-            distro: jessie
+            distro: bullseye
           - arch: riscv64
             distro: alpine_edge
           - arch: riscv64
-            distro: ubuntu20.04
+            distro: ubuntu22.04
           - arch: s390x
-            distro: stretch
+            distro: bullseye
           - arch: armv7
             distro: fedora_latest
           - arch: armv7
-            distro: ubuntu18.04
+            distro: ubuntu22.04
           - arch: aarch64
             distro: bullseye  
             # Run tests that only need to be run on one matrix node
@@ -84,7 +84,7 @@ jobs:
         # image layer.
         install: |
           case "${{ matrix.distro }}" in
-            ubuntu*|jessie|stretch|buster|bullseye)
+            ubuntu*|jessie|stretch|buster|bullseye|bookworm)
               apt-get update -q -y --force-yes
               apt-get install -q -y --force-yes git
               ;;

diff --git a/Dockerfiles/Dockerfile.aarch64.ubuntu16.04 b/Dockerfiles/Dockerfile.aarch64.ubuntu16.04
diff --git a/Dockerfiles/Dockerfile.aarch64.ubuntu18.04 b/Dockerfiles/Dockerfile.aarch64.ubuntu18.04
diff --git a/Dockerfiles/Dockerfile.armv6.jessie b/Dockerfiles/Dockerfile.armv6.jessie
diff --git a/Dockerfiles/Dockerfile.armv7.jessie b/Dockerfiles/Dockerfile.armv7.jessie
diff --git a/Dockerfiles/Dockerfile.armv7.ubuntu16.04 b/Dockerfiles/Dockerfile.armv7.ubuntu16.04
diff --git a/Dockerfiles/Dockerfile.armv7.ubuntu18.04 b/Dockerfiles/Dockerfile.armv7.ubuntu18.04
diff --git a/Dockerfiles/Dockerfile.ppc64le.jessie b/Dockerfiles/Dockerfile.ppc64le.jessie
diff --git a/Dockerfiles/Dockerfile.ppc64le.ubuntu16.04 b/Dockerfiles/Dockerfile.ppc64le.ubuntu16.04
diff --git a/Dockerfiles/Dockerfile.ppc64le.ubuntu18.04 b/Dockerfiles/Dockerfile.ppc64le.ubuntu18.04
diff --git a/Dockerfiles/Dockerfile.s390x.jessie b/Dockerfiles/Dockerfile.s390x.jessie
diff --git a/Dockerfiles/Dockerfile.s390x.stretch b/Dockerfiles/Dockerfile.s390x.stretch
diff --git a/Dockerfiles/Dockerfile.s390x.ubuntu16.04 b/Dockerfiles/Dockerfile.s390x.ubuntu16.04
diff --git a/Dockerfiles/Dockerfile.s390x.ubuntu18.04 b/Dockerfiles/Dockerfile.s390x.ubuntu18.04