Skip to content

Commit

Permalink
Merge pull request #11411 from Mab879/fix_artifact_gh_actions
Browse files Browse the repository at this point in the history
Update GitHub Artifacts Action Steps to v4
  • Loading branch information
jan-cerny authored Jan 3, 2024
2 parents 62ac8eb + e08bef9 commit 6e5a578
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 32 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/automatus-cs8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Test if there are no content changes
run: echo "CTF_OUTPUT_SIZE=$(stat --printf="%s" output.json)" >> $GITHUB_OUTPUT
id: ctf
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: output.json
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Build product
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
run: ./build_product rhel8 --derivatives
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ${{ env.DATASTREAM }}
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Get cached CTF output
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
id: get_ctf_output
with:
name: output.json
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
with:
path: 'output.json'
prop_path: 'ansible'
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ${{ env.DATASTREAM }}
Expand All @@ -148,7 +148,7 @@ jobs:
continue-on-error: true
- name: Upload logs in case of failure
if: ${{steps.bash.outputs.prop == 'True' && steps.check_results_bash.outcome == 'success' && steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs_bash
path: logs_bash/
Expand All @@ -164,7 +164,7 @@ jobs:
continue-on-error: true
- name: Upload logs in case of failure
if: ${{ steps.ansible.outputs.prop == 'True' && steps.check_results_ansible.outcome == 'success' && steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs_ansible
path: logs_ansible/
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/automatus-cs9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Test if there are no content changes
run: echo "CTF_OUTPUT_SIZE=$(stat --printf="%s" output.json)" >> $GITHUB_OUTPUT
id: ctf
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: output.json
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Build product
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
run: ./build_product rhel9 --derivatives
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ${{ env.DATASTREAM }}
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Get cached CTF output
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
id: get_ctf_output
with:
name: output.json
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
with:
path: 'output.json'
prop_path: 'ansible'
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ${{ env.DATASTREAM }}
Expand All @@ -148,7 +148,7 @@ jobs:
continue-on-error: true
- name: Upload logs in case of failure
if: ${{steps.bash.outputs.prop == 'True' && steps.check_results_bash.outcome == 'success' && steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs_bash
path: logs_bash/
Expand All @@ -164,7 +164,7 @@ jobs:
continue-on-error: true
- name: Upload logs in case of failure
if: ${{ steps.ansible.outputs.prop == 'True' && steps.check_results_ansible.outcome == 'success' && steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs_ansible
path: logs_ansible/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/automatus-sanity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fetch-depth: 0
- name: Build product
run: ./build_product fedora --debug
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ env.DATASTREAM }}
path: build/${{ env.DATASTREAM }}
Expand All @@ -47,7 +47,7 @@ jobs:
sudo chown root:root /usr/local/bin/oscap-ssh
rm -f oscap-ssh
- name: Get Datastream
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.DATASTREAM }}
- name: Check One Rule
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/automatus-sle15.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Test if there are no content changes
run: echo "CTF_OUTPUT_SIZE=$(stat --printf="%s" output.json)" >> $GITHUB_OUTPUT
id: ctf
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: output.json
Expand All @@ -63,7 +63,7 @@ jobs:
- name: Build product
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
run: ./build_product sle15
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ${{ env.DATASTREAM }}
Expand All @@ -78,7 +78,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Get cached CTF output
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
id: get_ctf_output
with:
name: output.json
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
with:
path: 'output.json'
prop_path: 'ansible'
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ${{ env.DATASTREAM }}
Expand All @@ -156,7 +156,7 @@ jobs:
continue-on-error: true
- name: Upload logs in case of failure
if: ${{steps.bash.outputs.prop == 'True' && steps.check_results_bash.outcome == 'success' && steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs_bash
path: logs_bash/
Expand All @@ -172,7 +172,7 @@ jobs:
continue-on-error: true
- name: Upload logs in case of failure
if: ${{ steps.ansible.outputs.prop == 'True' && steps.check_results_ansible.outcome == 'success' && steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs_ansible
path: logs_ansible/
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/automatus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Test if there are no content changes
run: echo "CTF_OUTPUT_SIZE=$(stat --printf="%s" output.json)" >> $GITHUB_OUTPUT
id: ctf
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: output.json
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Build product
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
run: ./build_product ${{steps.product.outputs.prop}} --datastream-only
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ssg-${{steps.product.outputs.prop}}-ds.xml
Expand All @@ -68,7 +68,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Get cached CTF output
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
id: get_ctf_output
with:
name: output.json
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
with:
path: 'output.json'
prop_path: 'ansible'
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
with:
name: ssg-${{steps.product.outputs.prop}}-ds.xml
Expand All @@ -146,7 +146,7 @@ jobs:
continue-on-error: true
- name: Upload logs in case of failure
if: ${{steps.bash.outputs.prop == 'True' && steps.check_results_bash.outcome == 'success' && steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs_bash
path: logs_bash/
Expand All @@ -162,7 +162,7 @@ jobs:
continue-on-error: true
- name: Upload logs in case of failure
if: ${{ steps.ansible.outputs.prop == 'True' && steps.check_results_ansible.outcome == 'success' && steps.ctf.outputs.CTF_OUTPUT_SIZE != '0' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs_ansible
path: logs_ansible/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
git-config-name: openscap-ci
git-config-email: [email protected]
- name: Upload artifact if the event is pull request
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'pull_request' }}
with:
name: built-content
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: ninja -j2 package_source
working-directory: ./build
- name: 'Upload Artifact'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Nightly Build
path: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/srg-mapping-table.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ jobs:
run: python3 utils/create_srg_export.py -c controls/srg_gpos.yml -p rhel9 -m shared/references/disa-os-srg-v2r3.xml --out-format html --output $PAGES_DIR/srg-mapping-rhel9.html
env:
PYTHONPATH: ${{ github.workspace }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'pull_request' }}
with:
name: srg-mapping-rhel9.xlsx
path: ${{ env.PAGES_DIR }}/srg-mapping-rhel9.xlsx
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'pull_request' }}
with:
name: srg-mapping-rhel9.html
path: ${{ env.PAGES_DIR }}/srg-mapping-rhel9.html
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'pull_request' }}
with:
name: srg-mapping-ocp4.xlsx
path: ${{ env.PAGES_DIR }}/srg-mapping-ocp4.xlsx
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'pull_request' }}
with:
name: srg-mapping-ocp4.html
Expand Down

0 comments on commit 6e5a578

Please sign in to comment.