From 1309a7395842d930dcdb729c53baba2cebeebe66 Mon Sep 17 00:00:00 2001 From: romeroalx Date: Wed, 22 May 2024 05:40:34 +0200 Subject: [PATCH] gh actions: build-packages and builder on ubuntu-22 runners --- .github/workflows/build-packages.yml | 9 ++++----- .github/workflows/builder.yml | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 127acc635b..d226d86e86 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -48,7 +48,7 @@ permissions: # least privileges, see https://docs.github.com/en/actions/using-wo jobs: prepare: name: generate OS list - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: oslist: ${{ steps.get-oslist.outputs.oslist }} steps: @@ -61,8 +61,7 @@ jobs: build: needs: prepare name: build ${{ inputs.product }} (${{ inputs.ref }}) for ${{ matrix.os }} - # on a ubuntu-20.04 VM - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: os: ${{fromJson(needs.prepare.outputs.oslist)}} @@ -141,7 +140,7 @@ jobs: check-hashes: needs: build name: Check if hashes were created for all requested targets - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Get list of outputs from build jobs run: echo '${{ toJSON(needs.build.outputs) }}' | jq 'keys[]' | grep -v version | tee /tmp/build-outputs.txt @@ -182,7 +181,7 @@ jobs: upload-provenance: needs: [prepare, build, provenance-src, provenance-pkgs] name: Upload the provenance artifacts to downloads.powerdns.com - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: os: ${{fromJson(needs.prepare.outputs.oslist)}} diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 7592298245..43cfc9e39b 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -19,8 +19,7 @@ jobs: build: name: build.sh if: ${{ vars.SCHEDULED_JOBS_BUILDER }} - # on a ubuntu-20.04 VM - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: product: ['authoritative', 'recursor', 'dnsdist'] -- 2.47.2