Skip to content

Commit 9e473b2

Browse files
authored
Merge pull request #48 from ashoksundeep/ubuntu2404
Add support for Ubuntu 24.04
2 parents 2cfd50a + 360a529 commit 9e473b2

File tree

11 files changed

+295
-159
lines changed

11 files changed

+295
-159
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010
jobs:
1111
setup_matrix:
1212
name: Setup Test Matrix
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414
timeout-minutes: 40
1515
outputs:
1616
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
@@ -24,19 +24,23 @@ jobs:
2424
ruby-version: '2.7.3'
2525
bundler-cache: true
2626

27-
- name: Run static validations
28-
run: bundle exec rake validate lint
27+
28+
- name: Run Puppet Syntax Check
29+
run: bundle exec rake syntax
30+
31+
- name: Run Puppet Lint
32+
run: bundle exec rake lint
2933

3034
- name: Run rake rubocop
3135
run: bundle exec rake rubocop
3236

3337
- name: Setup Test Matrix
3438
id: get-outputs
35-
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false
39+
run: bundle exec metadata2gha --pidfile-workaround false
3640

3741
unit:
3842
needs: setup_matrix
39-
runs-on: ubuntu-20.04
43+
runs-on: ubuntu-22.04
4044
timeout-minutes: 40
4145
strategy:
4246
fail-fast: false
@@ -58,7 +62,7 @@ jobs:
5862
# TODO: active when acceptance tests have been added
5963
# acceptance:
6064
# name: Litmus Acceptance
61-
# runs-on: ubuntu-20.04
65+
# runs-on: ubuntu-latest
6266
# env:
6367
# BOLT_GEM: true
6468
# CI: true
@@ -86,7 +90,7 @@ jobs:
8690
- unit
8791
# TODO: active when acceptance tests have been added
8892
# - acceptance
89-
runs-on: ubuntu-20.04
93+
runs-on: ubuntu-latest
9094
name: Test suite
9195
steps:
9296
- run: echo Test suite completed

.gitignore

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store
2526
.project
2627
.envrc
2728
/inventory.yaml
2829
/spec/fixtures/litmus_inventory.yaml
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log

.pdkignore

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,34 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
22+
/.vendor/
2223
/convert_report.txt
2324
/update_report.txt
2425
.DS_Store
2526
.project
2627
.envrc
2728
/inventory.yaml
2829
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
30+
.resource_types
31+
.modules
32+
.task_cache.json
33+
.plan_cache.json
34+
.rerun.json
35+
bolt-debug.log
3136
/.fixtures.yml
3237
/Gemfile
3338
/.gitattributes
39+
/.github/
3440
/.gitignore
35-
/.gitlab-ci.yml
3641
/.pdkignore
3742
/.puppet-lint.rc
3843
/Rakefile
3944
/rakelib/
4045
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
46+
/..yml
4347
/.yardopts
4448
/spec/
4549
/.vscode/

0 commit comments

Comments
 (0)