From 16693a4821450e0d9795a90a5f539a6addd0d142 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 2 Jun 2022 07:43:24 +0200 Subject: [PATCH] TT#124273 GitHub actions: upgrade from buster to bullseye In commit a4ee01d27fd we switched to debhelper compat level 13. debhelper v13 isn't available in (plain) Debian buster, and therefore the Debian pipeline for buster fails with: | The following packages have unmet dependencies: | builddeps:. : Depends: debhelper-compat (= 13) Since we updated packaging for bullseye, also adapt the GitHub actions / workflow accordingly. Change-Id: I411a6ab16ee48c5c5fc1ca43c58c016df83e1ff7 --- .../actions/{debpkg-buster => debpkg-bullseye}/Dockerfile | 2 +- .github/actions/debpkg-bullseye/action.yml | 6 ++++++ .../{debpkg-buster => debpkg-bullseye}/entrypoint.sh | 0 .github/actions/debpkg-buster/action.yml | 6 ------ .github/workflows/debpkg.yml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) rename .github/actions/{debpkg-buster => debpkg-bullseye}/Dockerfile (94%) create mode 100644 .github/actions/debpkg-bullseye/action.yml rename .github/actions/{debpkg-buster => debpkg-bullseye}/entrypoint.sh (100%) delete mode 100644 .github/actions/debpkg-buster/action.yml diff --git a/.github/actions/debpkg-buster/Dockerfile b/.github/actions/debpkg-bullseye/Dockerfile similarity index 94% rename from .github/actions/debpkg-buster/Dockerfile rename to .github/actions/debpkg-bullseye/Dockerfile index 19322a6a4..6915587e5 100644 --- a/.github/actions/debpkg-buster/Dockerfile +++ b/.github/actions/debpkg-bullseye/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:bullseye COPY entrypoint.sh /entrypoint.sh diff --git a/.github/actions/debpkg-bullseye/action.yml b/.github/actions/debpkg-bullseye/action.yml new file mode 100644 index 000000000..66fa97ff6 --- /dev/null +++ b/.github/actions/debpkg-bullseye/action.yml @@ -0,0 +1,6 @@ +name: "Build Docker image based on Debian/bullseye" +description: "Build Docker image based on Debian/bullseye" + +runs: + using: 'docker' + image: 'Dockerfile' diff --git a/.github/actions/debpkg-buster/entrypoint.sh b/.github/actions/debpkg-bullseye/entrypoint.sh similarity index 100% rename from .github/actions/debpkg-buster/entrypoint.sh rename to .github/actions/debpkg-bullseye/entrypoint.sh diff --git a/.github/actions/debpkg-buster/action.yml b/.github/actions/debpkg-buster/action.yml deleted file mode 100644 index 087b58f58..000000000 --- a/.github/actions/debpkg-buster/action.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: "Build Docker image based on Debian/buster" -description: "Build Docker image based on Debian/buster" - -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/workflows/debpkg.yml b/.github/workflows/debpkg.yml index 8bf4c9cd7..d043ebd32 100644 --- a/.github/workflows/debpkg.yml +++ b/.github/workflows/debpkg.yml @@ -7,16 +7,16 @@ on: - cron: '0 8 * * *' jobs: - build-deb-buster: + build-deb-bullseye: runs-on: ubuntu-latest - name: Debian pipeline for buster + name: Debian pipeline for bullseye steps: - name: Checkout source uses: actions/checkout@v2 - name: Execute Docker debpkg action - uses: ./.github/actions/debpkg-buster + uses: ./.github/actions/debpkg-bullseye - name: Store Debian package artifacts uses: actions/upload-artifact@v2