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

feat: create a release #5

Merged
merged 19 commits into from
Feb 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions .github/workflows/dev-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ on:
push:
branches:
- develop

permissions:
contents: write # Allows write access to repository content
issues: write # Allows write access to issues (if needed)
pull-requests: write # Allows write access to pull requests (if needed)

jobs:
auto-content-update:
name: Autoupdate content
Expand All @@ -12,15 +18,14 @@ jobs:
with:
submodules: true
fetch-depth: 2
token: ${{ secrets.GIT_TOKEN }}
- name: Set up Python 3.8
token: ${{ secrets.GITHUB_TOKEN }}
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9
- name: Install Trestle
run: bash scripts/automation/install_trestle.sh
- name: Automatically update content on push
run: bash scripts/automation/check_and_update_all.sh
- name: Push the changes
run: bash scripts/automation/push.sh

run: bash scripts/automation/push.sh
20 changes: 10 additions & 10 deletions .github/workflows/main-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
with:
submodules: true
fetch-depth: 0
token: ${{ secrets.GIT_TOKEN }}
- name: Set up Python 3.8
token: ${{ secrets.GITHUB_TOKEN }}
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9
- name: Install Trestle
run: bash scripts/automation/install_trestle.sh
- name: Release
run: source scripts/automation/release.sh
- name: Push the changes
run: bash scripts/automation/push.sh
downstream-repo-update:
name: Update downstream repositories
name: Update downstream repositories - cd
runs-on: ubuntu-latest
needs: release
steps:
Expand All @@ -33,18 +33,18 @@ jobs:
with:
fetch-depth: 0
ref: main
token: ${{ secrets.GIT_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
- name: Clone downstream repo
uses: actions/checkout@v2
with:
repository: ComplianceAsCode/ocp-oscal-profiles
path: './ocp-oscal-profiles'
token: ${{ secrets.GIT_TOKEN }}
repository: oscal-compass/e2e-demo-cac-profile-cis
path: './e2e-demo-cac-profile-cis'
token: ${{ secrets.GITHUB_TOKEN }}
fetch-depth: 0
- name: Update profiles
run: bash scripts/automation/update_profile.sh
env:
GH_TOKEN: ${{ secrets.GIT_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
merge-main-to-develop:
name: Merge main to develop
runs-on: ubuntu-latest
Expand All @@ -56,7 +56,7 @@ jobs:
steps:
- uses: tukasz/direct-merge-action@master
with:
GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
source-branch: main
target-branch: develop
commit-message: "chore: Merge back version tags and changelog into develop."
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,4 @@ dmypy.json

.DS_Store
compliance-trestle/
/.project
75 changes: 0 additions & 75 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,77 +1,2 @@
# Changelog

<!--next-version-placeholder-->

## v0.2.0 (2023-02-15)
### Feature
* Catalog from CIS-b xlsx ([#25](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/25)) ([`0e3af0e`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/0e3af0eb0df0fd535b658225de34815064a0a5ce))

### Fix
* Updated CIS-1.1.1 ([#24](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/24)) ([`1c45a6d`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/1c45a6d621375b495b3aa199cc0d6b11f8d0a057))

## v0.1.10 (2023-01-11)
### Fix
* Updated CIS-1.1.1 ([#22](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/22)) ([`1f8a930`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/1f8a9309ffc7cc3da0f31ec3ddee58af0579d55b))

## v0.1.9 (2023-01-11)
### Fix
* Remove test ([`8533dd1`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/8533dd1295de4dfcdbd48152f48ad5f28fe0d392))

## v0.1.8 (2023-01-11)
### Fix
* Test release ([`24adaaa`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/24adaaa546cdf33e3b8d196bec5f71ad64050505))
* Fix checkout in downstream update workflow ([`a24fab5`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/a24fab5413cf1ed3c797f8e321a5e663bf99c33c))

## v0.1.7 (2022-12-17)
### Fix
* Updated CIS-1.1.1 ([#18](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/18)) ([`0356b09`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/0356b097a9bc3517ea46863e84dbc9735184d8ad))

## v0.1.6 (2022-12-17)
### Fix
* Test update CIS-1.1.1 ([#16](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/16)) ([`744f310`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/744f310a1ce18dbb72c4480838636bf6c574ac67))

## v0.1.5 (2022-12-17)
### Fix
* Updated CIS-1.1.1 ([#15](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/15)) ([`577d506`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/577d5066e44e1d40dbee4e8f95c0dabb99ccd8d5))

## v0.1.4 (2022-12-13)
### Fix
* Updated CIS-1.1.1 ([#13](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/13)) ([`21f2880`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/21f2880f8b94c5c131020fbfd27bcbb16dda62ac))
* Add token to main flow ([`3e4ceae`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/3e4ceaef5189b63a4e356ad47fdfe826385247c5))
* Add token to dev push ([`e173c9b`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/e173c9bcc2e61b9b5c186f3d77f43372e95ba6e4))
* Change md ([`59dcf62`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/59dcf62f8b6e0afaf28609df3b48db7e87a4ce9b))
* Change md ([`0f4e554`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/0f4e554a2813023cd280508ca232f66ba53afddc))
* Fix username ([`199cbe9`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/199cbe922d019d27047d78edf403c4ce26ed52ae))
* Update md ([`2cb6d0e`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/2cb6d0e3f372b84c61a207e0e003056e2d8a9c2b))
* Updated CIS-1.1.1 ([#12](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/12)) ([`aa59fc4`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/aa59fc4b8770026701043697c64be9dbbbeafc6f))
* Updated CIS-1.1.1 ([#10](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/10)) ([`b034482`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/b034482339981d26b49d6220120f7a446cf3e6e4))
* Fix automatic pr titles ([`a029cb2`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/a029cb2d9604fef3acba37e99117aa312d36318e))

## v0.1.3 (2022-12-13)
### Fix
* Fix automatic downstream pr creation ([`dce9904`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/dce990437381f16ce365fa29631fec69abc24e0c))

## v0.1.2 (2022-12-12)
### Fix
* Updated codeowners ([#8](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/8)) ([`b522a29`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/b522a2968fc4e740b09fb66d3c8c69e4c720a4de))

## v0.1.1 (2022-12-12)
### Fix
* Change remote ([`967e5c8`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/967e5c850a4d1d4037eddb681327858ec8027651))
* Add username ([`b25a66f`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/b25a66fff8956245eeda53cb8d74d2d7d73436c5))
* Add downstream automation ([`2f51316`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/2f51316cbdf496bdebb4e78d7d3e33621c92af76))
* Add downstream autoupdate ([`8c9bdc7`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/8c9bdc7af0ad9169b5ceb2d79731a4466eed5648))

## v0.1.0 (2022-12-11)
### Feature
* Add versioning ([`e558c86`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/e558c8643d56b40667220cc848ed66b2a33fc745))
* Add release scripts ([`7a90bff`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/7a90bff0ec2e7e3d9f53811c766d2f272cc2346e))
* Update workflows ([`18d65cc`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/18d65cc00b601c2c1ee93d03aa83e2cf2c2dde43))
* Merge back on release ([`94ffc13`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/94ffc13ecb352eeb645d77b77b00d0fa27d00af8))
* Change catalog ([`3c0cfb2`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/3c0cfb2c9de419e01469ab5339e1ccf9989da5f1))
* Change catalog ([`3781ea7`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/3781ea79a79a8b1c1f49aa6180f9a0e0b8d87684))
* Add git actions ([`6d098f5`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/6d098f565ea321e81ec8da18001212de862059fd))

### Fix
* Close if ([`39d731e`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/39d731ef1e4f2d1996e0356da7306a6f7b4968a2))
* Update trestle version ([`ec09621`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/ec096212ba5ab1ac55548f838eb8b85c1145be88))
5 changes: 0 additions & 5 deletions CODEOWNERS

This file was deleted.

Loading