Skip to content

Commit

Permalink
Merge pull request #4376 from FuriousLlama/master-merge-test
Browse files Browse the repository at this point in the history
Master merge test
  • Loading branch information
FuriousLlama authored Oct 3, 2024
2 parents df7b88a + e7e466e commit 87f50be
Show file tree
Hide file tree
Showing 1,764 changed files with 367,156 additions and 32,655 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/api-dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
outputs:
backend: ${{ steps.filter.outputs.backend }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
id: filter
with:
Expand All @@ -32,7 +32,7 @@ jobs:
GIT_BRANCH: "${{github.ref}}"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Extract Branch Name
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/app-logging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
working-directory: ./openshift/4.0/templates/Logging

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set ENV variable
run: |
if [[ ${{github.event.ref}} == 'refs/heads/test' ]]; then
Expand All @@ -55,7 +55,7 @@ jobs:
time: '180s'
- name: Check Extracted Logs
run: |
docker cp pims-logging:/logging/. .
docker cp pims-logging:/logging/. .
exitcode=$(docker inspect pims-logging --format='{{.State.ExitCode}}')
if [[ "$(ls -A pims* 2>/dev/null | wc -l)" != "0" ]]; then
ls -A pims* && rm -f pims*
Expand All @@ -72,4 +72,4 @@ jobs:
- name: Stop containers
if: always()
run: docker-compose -f "docker-compose.yml" down
working-directory: ${{env.working-directory}}
working-directory: ${{env.working-directory}}
6 changes: 3 additions & 3 deletions .github/workflows/app-react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
outputs:
frontend: ${{ steps.filter.outputs.frontend }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
id: filter
with:
Expand All @@ -32,7 +32,7 @@ jobs:
GIT_BRANCH: "${{github.ref}}"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Extract Branch Name
shell: bash
Expand All @@ -59,7 +59,7 @@ jobs:

- name: Codecov
uses: codecov/[email protected]
env:
env:
CODECOV_TOKEN: ${{ secrets.CODECOV }}
with:
# User defined upload name. Visible in Codecov UI
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci-cd-pims-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -71,7 +71,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -89,7 +89,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -112,7 +112,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -133,7 +133,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET 8
uses: actions/setup-dotnet@v3
Expand All @@ -160,7 +160,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-cd-pims-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
- name: Login to OpenShift
Expand All @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
- name: Login to OpenShift
Expand All @@ -87,7 +87,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
- name: Fetch Tags
Expand All @@ -109,7 +109,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
- name: Login to OpenShift
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/credentials-comment-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
if: github.event.workflow_run.event == 'pull_request'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download artifact
uses: actions/[email protected]
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/credentials-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup python
uses: actions/setup-python@v2
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
echo ${{ github.event.pull_request.number }} > ./pr/NR
./tools/cicd/build/secops_report.sh trufflehog_report.json > ./pr/PRBODY
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: always()
with:
name: pr
Expand All @@ -61,7 +61,7 @@ jobs:

- name: Upload HTML report
if: failure()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Security Scan Report
path: trufflehog_report.html
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/db-schma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
working-directory: ./source/database/mssql/scripts/dbscripts

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up random env variable
run: |
passvar=$(date +%s | sha256sum | base64 | head -c 29)A8!
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-prod-start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
needs: ci-cd-start-notification
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -108,7 +108,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -129,7 +129,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup .NET 8
uses: actions/setup-dotnet@v3
Expand Down
Loading

0 comments on commit 87f50be

Please sign in to comment.