From 0a55f93e49b361e90a810bb5f7510d84665f6577 Mon Sep 17 00:00:00 2001 From: Umberto Raimondi Date: Sat, 27 Jan 2024 17:52:04 +0100 Subject: [PATCH] Remove obsolete Dockerfiles, update tests --- .github/workflows/advanced-example.yml | 8 +++---- .github/workflows/basic-example.yml | 6 ++--- .github/workflows/swift-build.yml | 27 ---------------------- .github/workflows/test.yml | 12 +++++----- Dockerfiles/Dockerfile.aarch64.ubuntu16.04 | 4 ---- Dockerfiles/Dockerfile.aarch64.ubuntu18.04 | 4 ---- Dockerfiles/Dockerfile.armv6.jessie | 4 ---- Dockerfiles/Dockerfile.armv7.jessie | 4 ---- Dockerfiles/Dockerfile.armv7.ubuntu16.04 | 4 ---- Dockerfiles/Dockerfile.armv7.ubuntu18.04 | 4 ---- Dockerfiles/Dockerfile.ppc64le.jessie | 4 ---- Dockerfiles/Dockerfile.ppc64le.ubuntu16.04 | 4 ---- Dockerfiles/Dockerfile.ppc64le.ubuntu18.04 | 4 ---- Dockerfiles/Dockerfile.s390x.jessie | 4 ---- Dockerfiles/Dockerfile.s390x.stretch | 4 ---- Dockerfiles/Dockerfile.s390x.ubuntu16.04 | 4 ---- Dockerfiles/Dockerfile.s390x.ubuntu18.04 | 4 ---- 17 files changed, 13 insertions(+), 92 deletions(-) delete mode 100644 .github/workflows/swift-build.yml delete mode 100644 Dockerfiles/Dockerfile.aarch64.ubuntu16.04 delete mode 100644 Dockerfiles/Dockerfile.aarch64.ubuntu18.04 delete mode 100644 Dockerfiles/Dockerfile.armv6.jessie delete mode 100644 Dockerfiles/Dockerfile.armv7.jessie delete mode 100644 Dockerfiles/Dockerfile.armv7.ubuntu16.04 delete mode 100644 Dockerfiles/Dockerfile.armv7.ubuntu18.04 delete mode 100644 Dockerfiles/Dockerfile.ppc64le.jessie delete mode 100644 Dockerfiles/Dockerfile.ppc64le.ubuntu16.04 delete mode 100644 Dockerfiles/Dockerfile.ppc64le.ubuntu18.04 delete mode 100644 Dockerfiles/Dockerfile.s390x.jessie delete mode 100644 Dockerfiles/Dockerfile.s390x.stretch delete mode 100644 Dockerfiles/Dockerfile.s390x.ubuntu16.04 delete mode 100644 Dockerfiles/Dockerfile.s390x.ubuntu18.04 diff --git a/.github/workflows/advanced-example.yml b/.github/workflows/advanced-example.yml index fb53cb28..1ddd42dd 100644 --- a/.github/workflows/advanced-example.yml +++ b/.github/workflows/advanced-example.yml @@ -4,7 +4,7 @@ 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 @@ -12,7 +12,7 @@ jobs: 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 index 3203f670..fdf627ea 100644 --- a/.github/workflows/basic-example.yml +++ b/.github/workflows/basic-example.yml @@ -4,8 +4,8 @@ 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 @@ -13,7 +13,7 @@ jobs: 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 deleted file mode 100644 index 23e5de36..00000000 --- a/.github/workflows/swift-build.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Build with Swift on armv7 -on: [push, pull_request] - -jobs: - testactions_job: - runs-on: ubuntu-18.04 - name: A job to test the multi architecture actions - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Build - uses: ./ - with: - arch: armv7 - distro: ubuntu18.04 - githubToken: ${{ github.token }} - install: | - apt-get update -q -y - apt install -q -y libatomic1 libbsd0 clang libicu-dev libcurl4-nss-dev curl - curl -L https://github.com/uraimo/buildSwiftOnARM/releases/download/5.0.3/swift-5.0.3-armv7-Ubuntu1804.tgz -o /root/swift-5.0.3-armv7-Ubuntu1804.tgz - - run: | - cd /root - tar xzf swift-5.0.3-armv7-Ubuntu1804.tgz - echo "import Glibc;puts(\"Test!\");print(\"Test!!\")" > test.swift - ./usr/bin/swiftc test.swift - ./test diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a2bc5ccd..843565b5 100644 --- 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 deleted file mode 100644 index dcc22892..00000000 --- a/Dockerfiles/Dockerfile.aarch64.ubuntu16.04 +++ /dev/null @@ -1,4 +0,0 @@ -FROM arm64v8/ubuntu:16.04 - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.aarch64.ubuntu18.04 b/Dockerfiles/Dockerfile.aarch64.ubuntu18.04 deleted file mode 100644 index 610d38ac..00000000 --- a/Dockerfiles/Dockerfile.aarch64.ubuntu18.04 +++ /dev/null @@ -1,4 +0,0 @@ -FROM arm64v8/ubuntu:18.04 - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.armv6.jessie b/Dockerfiles/Dockerfile.armv6.jessie deleted file mode 100644 index ad76789c..00000000 --- a/Dockerfiles/Dockerfile.armv6.jessie +++ /dev/null @@ -1,4 +0,0 @@ -FROM balenalib/rpi-raspbian:jessie - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.armv7.jessie b/Dockerfiles/Dockerfile.armv7.jessie deleted file mode 100644 index 72c72326..00000000 --- a/Dockerfiles/Dockerfile.armv7.jessie +++ /dev/null @@ -1,4 +0,0 @@ -FROM arm32v7/debian:jessie - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.armv7.ubuntu16.04 b/Dockerfiles/Dockerfile.armv7.ubuntu16.04 deleted file mode 100644 index 8c91b300..00000000 --- a/Dockerfiles/Dockerfile.armv7.ubuntu16.04 +++ /dev/null @@ -1,4 +0,0 @@ -FROM arm32v7/ubuntu:16.04 - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.armv7.ubuntu18.04 b/Dockerfiles/Dockerfile.armv7.ubuntu18.04 deleted file mode 100644 index 8e0e57eb..00000000 --- a/Dockerfiles/Dockerfile.armv7.ubuntu18.04 +++ /dev/null @@ -1,4 +0,0 @@ -FROM arm32v7/ubuntu:18.04 - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.ppc64le.jessie b/Dockerfiles/Dockerfile.ppc64le.jessie deleted file mode 100644 index aea274a6..00000000 --- a/Dockerfiles/Dockerfile.ppc64le.jessie +++ /dev/null @@ -1,4 +0,0 @@ -FROM ppc64le/debian:jessie - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.ppc64le.ubuntu16.04 b/Dockerfiles/Dockerfile.ppc64le.ubuntu16.04 deleted file mode 100644 index b8e3bdc1..00000000 --- a/Dockerfiles/Dockerfile.ppc64le.ubuntu16.04 +++ /dev/null @@ -1,4 +0,0 @@ -FROM ppc64le/ubuntu:16.04 - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.ppc64le.ubuntu18.04 b/Dockerfiles/Dockerfile.ppc64le.ubuntu18.04 deleted file mode 100644 index 41278541..00000000 --- a/Dockerfiles/Dockerfile.ppc64le.ubuntu18.04 +++ /dev/null @@ -1,4 +0,0 @@ -FROM ppc64le/ubuntu:18.04 - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.s390x.jessie b/Dockerfiles/Dockerfile.s390x.jessie deleted file mode 100644 index 6d3702cb..00000000 --- a/Dockerfiles/Dockerfile.s390x.jessie +++ /dev/null @@ -1,4 +0,0 @@ -FROM s390x/debian:jessie - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.s390x.stretch b/Dockerfiles/Dockerfile.s390x.stretch deleted file mode 100644 index 36c9b9ac..00000000 --- a/Dockerfiles/Dockerfile.s390x.stretch +++ /dev/null @@ -1,4 +0,0 @@ -FROM s390x/debian:stretch - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.s390x.ubuntu16.04 b/Dockerfiles/Dockerfile.s390x.ubuntu16.04 deleted file mode 100644 index 50af57d9..00000000 --- a/Dockerfiles/Dockerfile.s390x.ubuntu16.04 +++ /dev/null @@ -1,4 +0,0 @@ -FROM s390x/ubuntu:16.04 - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh diff --git a/Dockerfiles/Dockerfile.s390x.ubuntu18.04 b/Dockerfiles/Dockerfile.s390x.ubuntu18.04 deleted file mode 100644 index f677fc4f..00000000 --- a/Dockerfiles/Dockerfile.s390x.ubuntu18.04 +++ /dev/null @@ -1,4 +0,0 @@ -FROM s390x/ubuntu:18.04 - -COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh -RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh