Skip to content

⚠️ CONFLICT! Lineage pull request for: skeleton #17

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 12 commits into from
Jul 1, 2025
Merged

⚠️ CONFLICT! Lineage pull request for: skeleton #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ab35954
Upgrade to the latest version of the ansible-lint pre-commit hook
jsf9k May 7, 2025
5efc250
Remove support for Ubuntu Focal
jsf9k May 7, 2025
d2d8236
Merge pull request #210 from cisagov/improvement/upgrade-to-latest-an…
jsf9k May 27, 2025
0fd8a7b
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
May 27, 2025
ce194cb
Drop support for EOL platforms Fedora 39 and 40
jsf9k May 27, 2025
b52861f
Bump version from 1.0.0 to 2.0.0
jsf9k May 27, 2025
5f6c84c
Merge pull request #232 from cisagov/lineage/skeleton
jsf9k Jun 9, 2025
67d5717
Merge pull request #231 from cisagov/improvement/remove-eol-ubuntu-focal
jsf9k Jun 9, 2025
b57d128
Merge pull request #233 from cisagov/improvement/drop-eol-fedora-39-a…
jsf9k Jun 9, 2025
a170589
Add support for Fedora 42
jsf9k Apr 21, 2025
54e395e
Merge pull request #229 from cisagov/improvement/add-fedora-42
jsf9k Jun 9, 2025
e687187
Merge remote-tracking branch 'skeleton/develop' into lineage/skeleton
jsf9k Jun 13, 2025
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
52 changes: 8 additions & 44 deletions .config/molecule/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,53 +115,35 @@ platforms:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- cgroupns_mode: host
command: /lib/systemd/systemd
image: docker.io/geerlingguy/docker-fedora39-ansible:latest
name: fedora39-systemd-amd64
platform: amd64
pre_build_image: true
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- cgroupns_mode: host
command: /lib/systemd/systemd
image: docker.io/geerlingguy/docker-fedora39-ansible:latest
name: fedora39-systemd-arm64
platform: arm64
pre_build_image: true
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- cgroupns_mode: host
command: /lib/systemd/systemd
image: docker.io/geerlingguy/docker-fedora40-ansible:latest
name: fedora40-systemd-amd64
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
name: fedora41-systemd-amd64
platform: amd64
pre_build_image: true
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- cgroupns_mode: host
command: /lib/systemd/systemd
image: docker.io/geerlingguy/docker-fedora40-ansible:latest
name: fedora40-systemd-arm64
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
name: fedora41-systemd-arm64
platform: arm64
pre_build_image: true
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- cgroupns_mode: host
command: /lib/systemd/systemd
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
name: fedora41-systemd-amd64
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
name: fedora42-systemd-amd64
platform: amd64
pre_build_image: true
privileged: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
- cgroupns_mode: host
command: /lib/systemd/systemd
image: docker.io/geerlingguy/docker-fedora41-ansible:latest
name: fedora41-systemd-arm64
image: docker.io/geerlingguy/docker-fedora42-ansible:latest
name: fedora42-systemd-arm64
platform: arm64
pre_build_image: true
privileged: true
Expand All @@ -170,24 +152,6 @@ platforms:
# These platforms do not provide systemd-resolved.
# - cgroupns_mode: host
# command: /lib/systemd/systemd
# image: docker.io/geerlingguy/docker-ubuntu2004-ansible:latest
# name: ubuntu-20-systemd-amd64
# platform: amd64
# pre_build_image: true
# privileged: true
# volumes:
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
# - cgroupns_mode: host
# command: /lib/systemd/systemd
# image: docker.io/geerlingguy/docker-ubuntu2004-ansible:latest
# name: ubuntu-20-systemd-arm64
# platform: arm64
# pre_build_image: true
# privileged: true
# volumes:
# - /sys/fs/cgroup:/sys/fs/cgroup:rw
# - cgroupns_mode: host
# command: /lib/systemd/systemd
# image: docker.io/geerlingguy/docker-ubuntu2204-ansible:latest
# name: ubuntu-22-systemd-amd64
# platform: amd64
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,10 @@ jobs:
# - debian11-systemd
- debian12-systemd
- debian13-systemd
- fedora39-systemd
- fedora40-systemd
- fedora41-systemd
- fedora42-systemd
- kali-systemd
# These platforms do not provide systemd-resolved.
# - ubuntu-20-systemd
# - ubuntu-22-systemd
- ubuntu-24-systemd
scenario:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ repos:

# Ansible hooks
- repo: https://github.com/ansible/ansible-lint
rev: v25.1.3
rev: v25.4.0
hooks:
- id: ansible-lint
additional_dependencies:
Expand Down
4 changes: 1 addition & 3 deletions meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,14 @@ galaxy_info:
- trixie
- name: Fedora
versions:
- "39"
- "40"
- "41"
- "42"
- name: Kali
versions:
- "2023"
- name: Ubuntu
versions:
# These platforms do not provide systemd-resolved.
# - focal
# - jammy
- noble
role_name: systemd_resolved
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
2.0.0