Skip to content

chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.1.0 #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 14, 2025
Merged

chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.1.0 #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.ssf-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v2.0.1
_commit: v2.1.0
_src_path: https://github.com/dafyddj/copier-ssf-ci
failure_permitted_ignored: []
failure_permitted_patterns: []
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,19 @@ jobs:
name: Lint / `pre-commit`
needs: should-run
if: fromJSON(needs.should-run.outputs.should-run)
container: techneg/ci-pre-commit:v2.3.3
# yamllint disable-line rule:line-length
container: techneg/ci-pre-commit:v2.4.25@sha256:ff5192e893c1079fbf70e3ce6bfc3773815041786a75659793158be930ba7803
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
fetch-tags: true
filter: tree:0
- name: Export `CI_CACHE_ID` from container
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
path: ~/.cache/pre-commit
key: "${{ env.CI_CACHE_ID }}|\
Expand Down
72 changes: 36 additions & 36 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,42 +187,42 @@ rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
almalinux-9-3007-3: {extends: '.test_instance'}
almalinux-8-3007-3: {extends: '.test_instance'}
amazonlinux-2023-3007-3: {extends: '.test_instance'}
amazonlinux-2-3007-3: {extends: '.test_instance_failure_permitted'}
centos-stream9-3007-3: {extends: '.test_instance'}
debian-12-3007-3: {extends: '.test_instance'}
debian-11-3007-3: {extends: '.test_instance'}
fedora-41-3007-3: {extends: '.test_instance_failure_permitted'}
fedora-40-3007-3: {extends: '.test_instance'}
opensuse-leap-156-3007-3: {extends: '.test_instance'}
opensuse-tmbl-latest-3007-3: {extends: '.test_instance'}
oraclelinux-9-3007-3: {extends: '.test_instance'}
oraclelinux-8-3007-3: {extends: '.test_instance'}
rockylinux-9-3007-3: {extends: '.test_instance'}
rockylinux-8-3007-3: {extends: '.test_instance'}
ubuntu-2404-3007-3: {extends: '.test_instance'}
ubuntu-2204-3007-3: {extends: '.test_instance'}
ubuntu-2004-3007-3: {extends: '.test_instance'}
almalinux-9-3006-11: {extends: '.test_instance'}
almalinux-8-3006-11: {extends: '.test_instance'}
amazonlinux-2023-3006-11: {extends: '.test_instance'}
amazonlinux-2-3006-11: {extends: '.test_instance_failure_permitted'}
centos-stream9-3006-11: {extends: '.test_instance'}
debian-12-3006-11: {extends: '.test_instance'}
debian-11-3006-11: {extends: '.test_instance'}
fedora-41-3006-11: {extends: '.test_instance_failure_permitted'}
fedora-40-3006-11: {extends: '.test_instance'}
opensuse-leap-156-3006-11: {extends: '.test_instance'}
opensuse-tmbl-latest-3006-11: {extends: '.test_instance'}
oraclelinux-9-3006-11: {extends: '.test_instance'}
oraclelinux-8-3006-11: {extends: '.test_instance'}
rockylinux-9-3006-11: {extends: '.test_instance'}
rockylinux-8-3006-11: {extends: '.test_instance'}
ubuntu-2404-3006-11: {extends: '.test_instance'}
ubuntu-2204-3006-11: {extends: '.test_instance'}
ubuntu-2004-3006-11: {extends: '.test_instance'}
almalinux-9-3007-4: {extends: '.test_instance'}
almalinux-8-3007-4: {extends: '.test_instance'}
amazonlinux-2023-3007-4: {extends: '.test_instance'}
amazonlinux-2-3007-4: {extends: '.test_instance_failure_permitted'}
centos-stream9-3007-4: {extends: '.test_instance'}
debian-12-3007-4: {extends: '.test_instance'}
debian-11-3007-4: {extends: '.test_instance'}
fedora-41-3007-4: {extends: '.test_instance_failure_permitted'}
fedora-40-3007-4: {extends: '.test_instance'}
opensuse-leap-156-3007-4: {extends: '.test_instance'}
opensuse-tmbl-latest-3007-4: {extends: '.test_instance'}
oraclelinux-9-3007-4: {extends: '.test_instance'}
oraclelinux-8-3007-4: {extends: '.test_instance'}
rockylinux-9-3007-4: {extends: '.test_instance'}
rockylinux-8-3007-4: {extends: '.test_instance'}
ubuntu-2404-3007-4: {extends: '.test_instance'}
ubuntu-2204-3007-4: {extends: '.test_instance'}
ubuntu-2004-3007-4: {extends: '.test_instance'}
almalinux-9-3006-12: {extends: '.test_instance'}
almalinux-8-3006-12: {extends: '.test_instance'}
amazonlinux-2023-3006-12: {extends: '.test_instance'}
amazonlinux-2-3006-12: {extends: '.test_instance_failure_permitted'}
centos-stream9-3006-12: {extends: '.test_instance'}
debian-12-3006-12: {extends: '.test_instance'}
debian-11-3006-12: {extends: '.test_instance'}
fedora-41-3006-12: {extends: '.test_instance_failure_permitted'}
fedora-40-3006-12: {extends: '.test_instance'}
opensuse-leap-156-3006-12: {extends: '.test_instance'}
opensuse-tmbl-latest-3006-12: {extends: '.test_instance'}
oraclelinux-9-3006-12: {extends: '.test_instance'}
oraclelinux-8-3006-12: {extends: '.test_instance'}
rockylinux-9-3006-12: {extends: '.test_instance'}
rockylinux-8-3006-12: {extends: '.test_instance'}
ubuntu-2404-3006-12: {extends: '.test_instance'}
ubuntu-2204-3006-12: {extends: '.test_instance'}
ubuntu-2004-3006-12: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
# rubocop:enable Layout/LineLength

gem 'kitchen-inspec', '2.6.2'
gem 'kitchen-inspec', '3.0.0'
gem 'kitchen-salt', '0.7.2'

# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
gem 'net-ssh', '>= 7.0.0'

gem 'test-kitchen', '3.6.0'
gem 'test-kitchen', '3.7.0'
25 changes: 20 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ GEM
ms_rest_azure (~> 0.12.0)
base64 (0.2.0)
bcrypt_pbkdf (1.1.1)
bcrypt_pbkdf (1.1.1-x64-mingw-ucrt)
benchmark (0.4.0)
bigdecimal (3.1.9)
bson (4.15.0)
Expand Down Expand Up @@ -410,6 +411,9 @@ GEM
faraday_middleware (1.0.0)
faraday (~> 1.0)
ffi (1.16.3)
ffi (1.16.3-x64-mingw-ucrt)
ffi-win32-extensions (1.0.4)
ffi
fuzzyurl (0.9.0)
google-apis-admin_directory_v1 (0.46.0)
google-apis-core (>= 0.11.0, < 2.a)
Expand Down Expand Up @@ -459,9 +463,9 @@ GEM
json (2.12.0)
jwt (2.10.1)
base64
kitchen-inspec (2.6.2)
kitchen-inspec (3.0.0)
hashie (>= 3.4, <= 5.0)
inspec (>= 2.2.64, < 6.0)
inspec (>= 2.2.64, < 7.0)
test-kitchen (>= 2.7, < 4)
kitchen-salt (0.7.2)
hashie (>= 3.5)
Expand Down Expand Up @@ -492,6 +496,11 @@ GEM
ffi (>= 1.15.5)
mixlib-shellout (3.3.9)
chef-utils
mixlib-shellout (3.3.9-x64-mingw-ucrt)
chef-utils
ffi-win32-extensions (~> 1.0.3)
win32-process (~> 0.9)
wmi-lite (~> 1.0)
mixlib-versioning (1.2.12)
mongo (2.13.2)
bson (>= 4.8.2, < 5.0.0)
Expand All @@ -515,6 +524,8 @@ GEM
nokogiri (1.18.8)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.8-x64-mingw-ucrt)
racc (~> 1.4)
nori (2.7.0)
bigdecimal
options (2.3.2)
Expand Down Expand Up @@ -606,7 +617,7 @@ GEM
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
test-kitchen (3.6.0)
test-kitchen (3.7.0)
bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
Expand Down Expand Up @@ -759,6 +770,8 @@ GEM
uber (0.1.0)
unicode-display_width (2.6.0)
unicode_utils (1.4.0)
win32-process (0.10.0)
ffi (>= 1.0.0)
winrm (2.3.8)
builder (>= 2.1.2)
erubi (~> 1.8)
Expand All @@ -779,17 +792,19 @@ GEM
rubyzip (~> 2.0)
winrm (~> 2.0)
wisper (2.0.1)
wmi-lite (1.0.7)

PLATFORMS
ruby
x64-mingw-ucrt

DEPENDENCIES
inspec!
kitchen-docker!
kitchen-inspec (= 2.6.2)
kitchen-inspec (= 3.0.0)
kitchen-salt (= 0.7.2)
net-ssh (>= 7.0.0)
test-kitchen (= 3.6.0)
test-kitchen (= 3.7.0)

BUNDLED WITH
2.3.7
Loading
Loading