From 075a77cc6f64a9550835c38697605c01f1a7c2b6 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Tue, 11 Mar 2025 16:33:33 -0700 Subject: [PATCH 1/2] Use ubuntu-latest instead of 20.04 The ubuntu 20.04 GitHub runner is deprecated and will be dropped April 1, so use latest. The other ubuntu 20.04 instance is used to provision a docker container, so leave that as is. --- .github/workflows/task_acceptance_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/task_acceptance_tests.yaml b/.github/workflows/task_acceptance_tests.yaml index 7155af76..b3c196c5 100644 --- a/.github/workflows/task_acceptance_tests.yaml +++ b/.github/workflows/task_acceptance_tests.yaml @@ -20,7 +20,7 @@ jobs: BEAKER_debug: true BEAKER_set: docker/${{ matrix.os }} - runs-on: 'ubuntu-20.04' + runs-on: 'ubuntu-latest' steps: - name: Checkout current PR code uses: actions/checkout@v4 From 9b14a31e25582ef119c1cbaa2cb4e4e9537ca432 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Tue, 11 Mar 2025 16:48:38 -0700 Subject: [PATCH 2/2] Appease puppet-lint --- manifests/osfamily/debian.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/osfamily/debian.pp b/manifests/osfamily/debian.pp index 5138c61d..c9382001 100644 --- a/manifests/osfamily/debian.pp +++ b/manifests/osfamily/debian.pp @@ -59,7 +59,7 @@ # Pass in an empty content string since apt requires it even though we are removing it apt::setting { 'list-puppet-enterprise-installer': - ensure => absent, + ensure => absent, } apt::setting { 'conf-pe-repo':