Skip to content
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.

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

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

Merged
merged 36 commits into from
Aug 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
297ce13
Modify the ansible-core pin to ensure a good version is used
jsf9k May 21, 2024
07e2b60
Pin ansible-core when running the ansible-lint linter
jsf9k May 4, 2024
c74e5db
Remove unnecessary line
jsf9k May 4, 2024
2e53e0d
Explain why ansible may need to be added as a dependency for ansible-…
jsf9k May 7, 2024
f51fe62
Update pre-commit hook versions
mcdonnnj May 11, 2024
8e55b8e
Manually update the prettier hook
mcdonnnj Jun 6, 2024
c617bb9
Correct commented-out ansible pin
jsf9k Jun 6, 2024
de92c3c
Merge pull request #183 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj Jun 6, 2024
7ddea47
Merge pull request #182 from cisagov/improvement/pin-packages-for-ans…
mcdonnnj Jun 6, 2024
bc369af
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Jun 6, 2024
b66d137
Merge pull request #338 from cisagov/improvement/remove-ansible-core-pin
jsf9k Aug 12, 2024
6334bf2
Merge pull request #343 from cisagov/lineage/skeleton
jsf9k Aug 12, 2024
6041172
Alphabetize filters by name
jsf9k Jul 7, 2024
89c7e1e
Add a filter for the AMI's architecture
jsf9k Jul 7, 2024
d58b660
Add an architecture filter in the Packer config
jsf9k Jul 8, 2024
aaeb8bd
Add an ARM64 source to the Packer configuration
jsf9k Jul 10, 2024
2452ca5
Build both the x86-64 and ARM64 versions of the AMI
jsf9k Jul 10, 2024
8dec775
Update the AMI filter to include both the x86-64 and ARM64 AMIs
jsf9k Jul 10, 2024
793b46d
Bump version from 1.0.1 to 2.0.0
jsf9k Jul 10, 2024
95dc9a3
Bump version from 2.0.0 to 2.0.0-rc.1
jsf9k Jul 10, 2024
f6dbbb8
Reorder data blocks to match order of source blocks
jsf9k Jul 11, 2024
9332c38
Create separate resources for ARM64 and x86-64 AMIs and launch permis…
jsf9k Jul 11, 2024
18765c6
Add moved blocks for renamed resources
jsf9k Jul 11, 2024
51944d0
Add comments to moved blocks to explain the intent
jsf9k Aug 8, 2024
88528fe
Fix typos (missing spaces)
jsf9k Aug 9, 2024
f161416
Finalize version from 2.0.0-rc.1 to 2.0.0
jsf9k Aug 12, 2024
d44181d
Merge pull request #355 from cisagov/improvement/specify-architecture…
jsf9k Aug 12, 2024
874e250
Merge remote-tracking branch 'skeleton-packer/develop' into lineage/s…
jsf9k Aug 14, 2024
a379577
Remove support for ARM64
jsf9k Aug 14, 2024
3d0043c
Bump version from 0.5.27 to 0.5.28
jsf9k Aug 14, 2024
da840f1
Bump version from 0.5.28 to 0.5.28-rc.1
jsf9k Aug 14, 2024
f89d758
Fix typo in names of Kali base AMIs
jsf9k Aug 14, 2024
2da5a21
Upgrade to the latest version of the base AMI
jsf9k Aug 15, 2024
f784243
Temporarily use a non-default branch of cisagov/ansible-role-xfce-cool
jsf9k Aug 19, 2024
3167451
Revert "Temporarily use a non-default branch of cisagov/ansible-role-…
jsf9k Aug 21, 2024
06082bd
Finalize version from 0.5.28-rc.1 to 0.5.28
jsf9k Aug 21, 2024
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
Prev Previous commit
Next Next commit
Bump version from 2.0.0 to 2.0.0-rc.1
jsf9k committed Aug 12, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
jsf9k Shane Frasier
commit 95dc9a38a11dd0df0be7276e696ffb3bdbb15d77
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2.0.0"
__version__ = "2.0.0-rc.1"