Skip to content

Commit f1243d8

Browse files
authored
feat: create a release (#2)
1 parent 747cb62 commit f1243d8

File tree

197 files changed

+3810
-17656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+3810
-17656
lines changed

.github/workflows/dev-push.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ on:
33
push:
44
branches:
55
- develop
6+
7+
permissions:
8+
contents: write # Allows write access to repository content
9+
issues: write # Allows write access to issues (if needed)
10+
pull-requests: write # Allows write access to pull requests (if needed)
11+
612
jobs:
713
auto-content-update:
814
name: Autoupdate content
@@ -12,15 +18,14 @@ jobs:
1218
with:
1319
submodules: true
1420
fetch-depth: 2
15-
token: ${{ secrets.GIT_TOKEN }}
16-
- name: Set up Python 3.8
21+
token: ${{ secrets.GITHUB_TOKEN }}
22+
- name: Set up Python 3.9
1723
uses: actions/setup-python@v2
1824
with:
19-
python-version: 3.8
25+
python-version: 3.9
2026
- name: Install Trestle
2127
run: bash scripts/automation/install_trestle.sh
2228
- name: Automatically update content on push
2329
run: bash scripts/automation/check_and_update_all.sh
2430
- name: Push the changes
25-
run: bash scripts/automation/push.sh
26-
31+
run: bash scripts/automation/push.sh

.github/workflows/main-push.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
with:
1313
submodules: true
1414
fetch-depth: 0
15-
token: ${{ secrets.GIT_TOKEN }}
16-
- name: Set up Python 3.8
15+
token: ${{ secrets.GITHUB_TOKEN }}
16+
- name: Set up Python 3.9
1717
uses: actions/setup-python@v2
1818
with:
19-
python-version: 3.8
19+
python-version: 3.9
2020
- name: Install Trestle
2121
run: bash scripts/automation/install_trestle.sh
2222
- name: Release
2323
run: source scripts/automation/release.sh
2424
- name: Push the changes
2525
run: bash scripts/automation/push.sh
2626
downstream-repo-update:
27-
name: Update downstream repositories
27+
name: Update downstream repositories - cd
2828
runs-on: ubuntu-latest
2929
needs: release
3030
steps:
@@ -33,18 +33,18 @@ jobs:
3333
with:
3434
fetch-depth: 0
3535
ref: main
36-
token: ${{ secrets.GIT_TOKEN }}
36+
token: ${{ secrets.GITHUB_TOKEN }}
3737
- name: Clone downstream repo
3838
uses: actions/checkout@v2
3939
with:
40-
repository: ComplianceAsCode/ocp-oscal-profiles
41-
path: './ocp-oscal-profiles'
42-
token: ${{ secrets.GIT_TOKEN }}
40+
repository: oscal-compass/e2e-demo-cac-profile-cis
41+
path: './e2e-demo-cac-profile-cis'
42+
token: ${{ secrets.GITHUB_TOKEN }}
4343
fetch-depth: 0
4444
- name: Update profiles
4545
run: bash scripts/automation/update_profile.sh
4646
env:
47-
GH_TOKEN: ${{ secrets.GIT_TOKEN }}
47+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4848
merge-main-to-develop:
4949
name: Merge main to develop
5050
runs-on: ubuntu-latest
@@ -56,7 +56,7 @@ jobs:
5656
steps:
5757
- uses: tukasz/direct-merge-action@master
5858
with:
59-
GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6060
source-branch: main
6161
target-branch: develop
6262
commit-message: "chore: Merge back version tags and changelog into develop."

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,4 @@ dmypy.json
130130

131131
.DS_Store
132132
compliance-trestle/
133+
/.project

CHANGELOG.md

-75
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,2 @@
11
# Changelog
22

3-
<!--next-version-placeholder-->
4-
5-
## v0.2.0 (2023-02-15)
6-
### Feature
7-
* 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))
8-
9-
### Fix
10-
* 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))
11-
12-
## v0.1.10 (2023-01-11)
13-
### Fix
14-
* 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))
15-
16-
## v0.1.9 (2023-01-11)
17-
### Fix
18-
* Remove test ([`8533dd1`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/8533dd1295de4dfcdbd48152f48ad5f28fe0d392))
19-
20-
## v0.1.8 (2023-01-11)
21-
### Fix
22-
* Test release ([`24adaaa`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/24adaaa546cdf33e3b8d196bec5f71ad64050505))
23-
* Fix checkout in downstream update workflow ([`a24fab5`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/a24fab5413cf1ed3c797f8e321a5e663bf99c33c))
24-
25-
## v0.1.7 (2022-12-17)
26-
### Fix
27-
* 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))
28-
29-
## v0.1.6 (2022-12-17)
30-
### Fix
31-
* 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))
32-
33-
## v0.1.5 (2022-12-17)
34-
### Fix
35-
* 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))
36-
37-
## v0.1.4 (2022-12-13)
38-
### Fix
39-
* 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))
40-
* Add token to main flow ([`3e4ceae`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/3e4ceaef5189b63a4e356ad47fdfe826385247c5))
41-
* Add token to dev push ([`e173c9b`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/e173c9bcc2e61b9b5c186f3d77f43372e95ba6e4))
42-
* Change md ([`59dcf62`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/59dcf62f8b6e0afaf28609df3b48db7e87a4ce9b))
43-
* Change md ([`0f4e554`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/0f4e554a2813023cd280508ca232f66ba53afddc))
44-
* Fix username ([`199cbe9`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/199cbe922d019d27047d78edf403c4ce26ed52ae))
45-
* Update md ([`2cb6d0e`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/2cb6d0e3f372b84c61a207e0e003056e2d8a9c2b))
46-
* 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))
47-
* 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))
48-
* Fix automatic pr titles ([`a029cb2`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/a029cb2d9604fef3acba37e99117aa312d36318e))
49-
50-
## v0.1.3 (2022-12-13)
51-
### Fix
52-
* Fix automatic downstream pr creation ([`dce9904`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/dce990437381f16ce365fa29631fec69abc24e0c))
53-
54-
## v0.1.2 (2022-12-12)
55-
### Fix
56-
* Updated codeowners ([#8](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/issues/8)) ([`b522a29`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/b522a2968fc4e740b09fb66d3c8c69e4c720a4de))
57-
58-
## v0.1.1 (2022-12-12)
59-
### Fix
60-
* Change remote ([`967e5c8`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/967e5c850a4d1d4037eddb681327858ec8027651))
61-
* Add username ([`b25a66f`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/b25a66fff8956245eeda53cb8d74d2d7d73436c5))
62-
* Add downstream automation ([`2f51316`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/2f51316cbdf496bdebb4e78d7d3e33621c92af76))
63-
* Add downstream autoupdate ([`8c9bdc7`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/8c9bdc7af0ad9169b5ceb2d79731a4466eed5648))
64-
65-
## v0.1.0 (2022-12-11)
66-
### Feature
67-
* Add versioning ([`e558c86`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/e558c8643d56b40667220cc848ed66b2a33fc745))
68-
* Add release scripts ([`7a90bff`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/7a90bff0ec2e7e3d9f53811c766d2f272cc2346e))
69-
* Update workflows ([`18d65cc`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/18d65cc00b601c2c1ee93d03aa83e2cf2c2dde43))
70-
* Merge back on release ([`94ffc13`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/94ffc13ecb352eeb645d77b77b00d0fa27d00af8))
71-
* Change catalog ([`3c0cfb2`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/3c0cfb2c9de419e01469ab5339e1ccf9989da5f1))
72-
* Change catalog ([`3781ea7`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/3781ea79a79a8b1c1f49aa6180f9a0e0b8d87684))
73-
* Add git actions ([`6d098f5`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/6d098f565ea321e81ec8da18001212de862059fd))
74-
75-
### Fix
76-
* Close if ([`39d731e`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/39d731ef1e4f2d1996e0356da7306a6f7b4968a2))
77-
* Update trestle version ([`ec09621`](https://github.com/ComplianceAsCode/ocp-oscal-catalogs/commit/ec096212ba5ab1ac55548f838eb8b85c1145be88))

CODEOWNERS

-5
This file was deleted.

0 commit comments

Comments
 (0)