Skip to content

Commit

Permalink
fix GitHub Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
fraenki committed Aug 7, 2023
1 parent ac076d2 commit f6df618
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
26 changes: 14 additions & 12 deletions .github/workflows/ci.yaml
Expand Up @@ -16,31 +16,34 @@ jobs:
puppet_version: [7]

name: Check / Puppet ${{ matrix.puppet_version }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container: puppet/pdk:latest

steps:
- name: Install build-essential
run: |
export DEBIAN_FRONTEND=noninteractive;
apt-get --yes update
apt-get --yes install build-essential
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Run pdk validate
uses: puppets-epic-show-theatre/action-pdk-validate@31b5407676af16b690b2b8c54c0767af72fcc34f
with:
puppet-version: ${{ matrix.puppet_version }}
run: pdk validate --format=text --puppet-version ${{ matrix.puppet_version }}

- name: Run pdk test unit
uses: puppets-epic-show-theatre/action-pdk-test-unit@193987acba9977d1825fefbcbaf8d02d6af78106
with:
puppet-version: ${{ matrix.puppet_version }}
run: pdk test unit --format=text --puppet-version ${{ matrix.puppet_version }}

acceptance:
strategy:
fail-fast: false
matrix:
os: ['rocky8', 'ub2004', 'ub2204', 'deb11']
os: ['rocky8', 'ub2204', 'deb11']
puppet_version: [7]

name: Acceptance / ${{ matrix.os }} / Puppet ${{ matrix.puppet_version }}
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs:
- check

Expand All @@ -51,7 +54,7 @@ jobs:
sudo service docker restart
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -61,7 +64,6 @@ jobs:

- name: Run Litmus
env:
VENDOR_TYPE: ${{ matrix.vendor_type }}
DEBUG: true
run: |
bundle exec rake 'litmus:provision_list[gha_${{ matrix.os }}]'
Expand Down
2 changes: 1 addition & 1 deletion provision.yaml
Expand Up @@ -46,7 +46,7 @@ gha_rocky8:
# The most reliable workaround for the docker/systemd incompatibility.
# see https://github.com/docker/for-linux/issues/835
# see https://github.com/moby/moby/issues/38749
vars: '{docker_run_opts: ["-v /sys/fs/cgroup:/sys/fs/cgroup:ro"]}'
#vars: '{docker_run_opts: ["-v /sys/fs/cgroup:/sys/fs/cgroup:ro"]}'
gha_ub2004:
provisioner: docker
images: ['litmusimage/ubuntu:20.04']
Expand Down

0 comments on commit f6df618

Please sign in to comment.