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.

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

Update GitHub Action Versions #10543

Merged
merged 8 commits into from
May 26, 2023
Merged

Update GitHub Action Versions #10543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dfa2e48
Use actions/checkout@v3
Mab879 May 9, 2023
d84ab12
Upgrade to changelog v3
Mab879 May 9, 2023
961d57c
Update comment actions
Mab879 May 15, 2023
e90cb80
Update actions/download-artifact
Mab879 May 15, 2023
20aa885
Remove use of mstksg/get-package in actions
Mab879 May 15, 2023
40969f5
Update Code Climate
Mab879 May 16, 2023
9697d83
Ensure that we correctly stated the version for action-gh-release
Mab879 May 16, 2023
81b7326
Fix Automatus Fedora
Mab879 May 25, 2023
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
14 changes: 6 additions & 8 deletions .github/workflows/automatus-cs8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
- name: Install deps python
run: pip install gitpython xmldiff
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Checkout (CTF)
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ComplianceAsCode/content-test-filtering
path: ctf
Expand Down Expand Up @@ -66,13 +66,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Install Deps
uses: mstksg/get-package@master
with:
apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman
run: sudo apt-get update && sudo apt-get install cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Get cached CTF output
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
id: get_ctf_output
with:
name: output.json
Expand Down Expand Up @@ -129,7 +127,7 @@ jobs:
with:
path: 'output.json'
prop_path: 'ansible'
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ${{ env.DATASTREAM }}
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/automatus-cs9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
- name: Install deps python
run: pip install gitpython xmldiff
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Checkout (CTF)
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ComplianceAsCode/content-test-filtering
path: ctf
Expand Down Expand Up @@ -66,13 +66,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Install Deps
uses: mstksg/get-package@master
with:
apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman
run: sudo apt-get update && sudo apt-get install cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Get cached CTF output
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
id: get_ctf_output
with:
name: output.json
Expand Down Expand Up @@ -129,7 +127,7 @@ jobs:
with:
path: 'output.json'
prop_path: 'ansible'
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ${{ env.DATASTREAM }}
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/automatus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
- name: Install deps python
run: pip install gitpython xmldiff
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Checkout (CTF)
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ComplianceAsCode/content-test-filtering
path: ctf
Expand Down Expand Up @@ -64,13 +64,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Install Deps
uses: mstksg/get-package@master
with:
apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman
run: sudo apt-get update && sudo apt-get install cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Get cached CTF output
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
id: get_ctf_output
with:
name: output.json
Expand Down Expand Up @@ -127,7 +125,7 @@ jobs:
with:
path: 'output.json'
prop_path: 'ansible'
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ssg-${{steps.product.outputs.prop}}-ds.xml
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/compare-ds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install deps python
run: pip install gitpython xmldiff
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
Expand All @@ -27,12 +27,12 @@ jobs:
run: echo "::set-output name=FORK_POINT::$(git merge-base origin/$BASE_BRANCH ${{ github.event.pull_request.head.sha }})"
id: fork_point
- name: Checkout fork point
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ steps.fork_point.outputs.FORK_POINT }}
fetch-depth: 0
- name: Checkout (CTF)
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ComplianceAsCode/content-test-filtering
path: ctf
Expand All @@ -59,7 +59,7 @@ jobs:
run: cp build/ssg-${{steps.product.outputs.prop}}-ds.xml ssg-${{steps.product.outputs.prop}}-ds.xml
- name: Checkout
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
clean: false
Expand Down Expand Up @@ -90,15 +90,15 @@ jobs:
echo ::set-output name=log::${body:0:65000}
set +f
- name: Find Comment
uses: peter-evans/find-comment@v1
uses: peter-evans/find-comment@v2
id: fc
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: 'github-actions[bot]'
body-includes: This datastream diff is auto generated by the check
- name: Create or update comment
if: ${{ steps.compare_ds.outputs.COMPARE_DS_OUTPUT_SIZE != '0' && steps.compare_ds.outputs.COMPARE_DS_OUTPUT_SIZE <= 65000 }}
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v3
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
Expand All @@ -115,7 +115,7 @@ jobs:
edit-mode: replace
- name: Create or update a trimmed comment
if: ${{ steps.compare_ds.outputs.COMPARE_DS_OUTPUT_SIZE > 65000 }}
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v3
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/ctf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Deps
uses: mstksg/get-package@master
with:
apt-get: git python3-jinja2 python3-yaml python3-setuptools python3-deepdiff python3-git python3-github python3-requests xmldiff
run: sudo apt-get update && sudo apt-get install git python3-jinja2 python3-yaml python3-setuptools python3-deepdiff python3-git python3-github python3-requests xmldiff
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
Expand All @@ -25,12 +23,12 @@ jobs:
run: echo "::set-output name=FORK_POINT::$(git merge-base origin/$BASE_BRANCH ${{ github.event.pull_request.head.sha }})"
id: fork_point
- name: Checkout fork point
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ steps.fork_point.outputs.FORK_POINT }}
fetch-depth: 0
- name: Checkout (CTF)
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ComplianceAsCode/content-test-filtering
path: ctf
Expand All @@ -50,15 +48,15 @@ jobs:
path: 'output.json'
prop_path: 'product'
- name: Find Comment
uses: peter-evans/find-comment@v1
uses: peter-evans/find-comment@v2
id: fc
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: 'github-actions[bot]'
body-includes: Start a new ephemeral environment with changes proposed in this pull request
- name: Create or update comment
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v3
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
Expand All @@ -77,7 +75,7 @@ jobs:
edit-mode: replace
- name: Create or update a trimmed comment
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE == '0' }}
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v3
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gate-lint-ansible-roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install Deps
run: dnf install -y cmake make ninja-build openscap-utils python3-pyyaml python3-setuptools python3-jinja2 python3-pygithub ansible ansible-lint libxslt git
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Configure
run: cmake -DSSG_PRODUCT_DEFAULT=OFF -DSSG_PRODUCT_RHEL7=ON -DSSG_PRODUCT_RHEL8=ON -G Ninja ..
working-directory: ./build
Expand Down
24 changes: 10 additions & 14 deletions .github/workflows/gate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install Deps
run: yum install -y cmake make openscap-utils PyYAML libxslt xml-common python-jinja2 python-setuptools
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
run: |-
./build_product \
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Install Deps
run: zypper install -y git cmake make openscap-utils python3-PyYAML bats python3-pytest python3-pytest-cov python3-Jinja2 python3-setuptools libxslt-tools libxml2-tools ShellCheck
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
run: ./build_product alinux2 alinux3 chromium fedora firefox rhcos4 rhel7 rhel8 rhel9 sle12 sle15 ubuntu2004 ubuntu2204 uos20
- name: Test
Expand All @@ -62,7 +62,7 @@ jobs:
- name: Install deps python
run: pip3 install ruamel.yaml yamlpath pyyaml==5.4.1
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
env:
ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON"
Expand All @@ -77,11 +77,9 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Install Deps
uses: mstksg/get-package@master
with:
apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml python3-setuptools ansible-lint python3-github bats python3-pytest python3-pytest-cov shellcheck
run: sudo apt-get update && sudo apt-get install cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml python3-setuptools ansible-lint python3-github bats python3-pytest python3-pytest-cov shellcheck
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
env:
ADDITIONAL_CMAKE_OPTIONS: "-DSSG_SCE_ENABLED:BOOL=ON"
Expand Down Expand Up @@ -110,11 +108,9 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Install Deps
uses: mstksg/get-package@master
with:
apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml python3-setuptools ansible-lint python3-github bats python3-pytest python3-pytest-cov shellcheck
run: sudo apt-get update && sudo apt-get install cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml python3-setuptools ansible-lint python3-github bats python3-pytest python3-pytest-cov shellcheck
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
env:
ADDITIONAL_CMAKE_OPTIONS: "-DSSG_SCE_ENABLED:BOOL=ON"
Expand All @@ -137,7 +133,7 @@ jobs:
- name: Install deps python
run: pip install ruamel.yaml yamlpath types-openpyxl types-PyYAML xmldiff openpyxl openpyxl-stubs pandas cmakelint
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
run: |-
./build_product \
Expand Down Expand Up @@ -166,7 +162,7 @@ jobs:
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Upload coverage to Code Climate # Requires: git package
if: ${{ github.repository == 'ComplianceAsCode/content' }}
uses: paambaati/codeclimate-action@v3.0.0
uses: paambaati/codeclimate-action@v4.0.0
env:
CC_TEST_REPORTER_ID: e67e068471d32b63f8e9561dba8f6a3f84dcc76b05ebfd98e44ced1a91cff854
with:
Expand All @@ -187,7 +183,7 @@ jobs:
- name: Install deps python
run: pip install ruamel.yaml yamlpath types-openpyxl types-PyYAML openpyxl openpyxl-stubs pandas
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
run: |-
./build_product \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install deps python
run: pip3 install json2html
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
run: cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Debug
working-directory: ./build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Install Dependencies
run: dnf install -y cmake ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible-lint libxslt ansible
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Configure
run: cmake -G Ninja ..
working-directory: ./build
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release-changelog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
"labels": ["Documentation"]
}
],
"sort": "ASC",
"sort": {
"order": "ASC"
},
"template": "${{CHANGELOG}}",
"pr_template": "- ${{TITLE}} (#${{NUMBER}})",
"empty_template": "- no changes",
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install Deps
run: dnf install -y cmake ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible ansible-lint libxslt
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Configure
run: cmake ..
working-directory: ./build
Expand All @@ -35,13 +35,13 @@ jobs:
GITHUB_REF: ${{ github.ref }}
- name: Build Changelog
id: build_changelog
uses: mikepenz/release-changelog-builder-action@v1
uses: mikepenz/release-changelog-builder-action@v3
with:
configuration: .github/workflows/release-changelog.json
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v0.1.15
with:
draft: True
name: Content ${{ steps.set_version.outputs.ver }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/srg-mapping-table.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install deps python
run: pip3 install pandas openpyxl
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Build
run: cmake .. -G Ninja
working-directory: ./build
Expand Down