Skip to content

Commit 87f50be

Browse files
authored
Merge pull request #4376 from FuriousLlama/master-merge-test
Master merge test
2 parents df7b88a + e7e466e commit 87f50be

File tree

1,764 files changed

+367156
-32655
lines changed

Some content is hidden

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

1,764 files changed

+367156
-32655
lines changed

.github/workflows/api-dotnetcore.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
outputs:
1515
backend: ${{ steps.filter.outputs.backend }}
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- uses: dorny/paths-filter@v2
1919
id: filter
2020
with:
@@ -32,7 +32,7 @@ jobs:
3232
GIT_BRANCH: "${{github.ref}}"
3333

3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636

3737
- name: Extract Branch Name
3838
shell: bash

.github/workflows/app-logging.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
working-directory: ./openshift/4.0/templates/Logging
3333

3434
steps:
35-
- uses: actions/checkout@v1
35+
- uses: actions/checkout@v4
3636
- name: Set ENV variable
3737
run: |
3838
if [[ ${{github.event.ref}} == 'refs/heads/test' ]]; then
@@ -55,7 +55,7 @@ jobs:
5555
time: '180s'
5656
- name: Check Extracted Logs
5757
run: |
58-
docker cp pims-logging:/logging/. .
58+
docker cp pims-logging:/logging/. .
5959
exitcode=$(docker inspect pims-logging --format='{{.State.ExitCode}}')
6060
if [[ "$(ls -A pims* 2>/dev/null | wc -l)" != "0" ]]; then
6161
ls -A pims* && rm -f pims*
@@ -72,4 +72,4 @@ jobs:
7272
- name: Stop containers
7373
if: always()
7474
run: docker-compose -f "docker-compose.yml" down
75-
working-directory: ${{env.working-directory}}
75+
working-directory: ${{env.working-directory}}

.github/workflows/app-react.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
outputs:
1515
frontend: ${{ steps.filter.outputs.frontend }}
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- uses: dorny/paths-filter@v2
1919
id: filter
2020
with:
@@ -32,7 +32,7 @@ jobs:
3232
GIT_BRANCH: "${{github.ref}}"
3333

3434
steps:
35-
- uses: actions/checkout@v3
35+
- uses: actions/checkout@v4
3636

3737
- name: Extract Branch Name
3838
shell: bash
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Codecov
6161
uses: codecov/[email protected]
62-
env:
62+
env:
6363
CODECOV_TOKEN: ${{ secrets.CODECOV }}
6464
with:
6565
# User defined upload name. Visible in Codecov UI

.github/workflows/ci-cd-pims-dev.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
steps:
5454
- name: Checkout Source Code
55-
uses: actions/checkout@v3
55+
uses: actions/checkout@v4
5656
- name: Login to OpenShift
5757
uses: redhat-actions/oc-login@v1
5858
with:
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
steps:
7373
- name: Checkout Source Code
74-
uses: actions/checkout@v3
74+
uses: actions/checkout@v4
7575
- name: Login to OpenShift
7676
uses: redhat-actions/oc-login@v1
7777
with:
@@ -89,7 +89,7 @@ jobs:
8989
runs-on: ubuntu-latest
9090
steps:
9191
- name: Checkout Source Code
92-
uses: actions/checkout@v3
92+
uses: actions/checkout@v4
9393
- name: Login to OpenShift
9494
uses: redhat-actions/oc-login@v1
9595
with:
@@ -112,7 +112,7 @@ jobs:
112112
runs-on: ubuntu-latest
113113
steps:
114114
- name: Checkout Source Code
115-
uses: actions/checkout@v3
115+
uses: actions/checkout@v4
116116
- name: Login to OpenShift
117117
uses: redhat-actions/oc-login@v1
118118
with:
@@ -133,7 +133,7 @@ jobs:
133133
runs-on: ubuntu-latest
134134
steps:
135135
- name: Checkout Source Code
136-
uses: actions/checkout@v3
136+
uses: actions/checkout@v4
137137

138138
- name: Setup .NET 8
139139
uses: actions/setup-dotnet@v3
@@ -160,7 +160,7 @@ jobs:
160160
runs-on: ubuntu-latest
161161
steps:
162162
- name: Checkout Source Code
163-
uses: actions/checkout@v3
163+
uses: actions/checkout@v4
164164
- name: Login to OpenShift
165165
uses: redhat-actions/oc-login@v1
166166
with:

.github/workflows/ci-cd-pims-master.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- name: Checkout Source Code
49-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
5050
with:
5151
ref: master
5252
- name: Login to OpenShift
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
steps:
6969
- name: Checkout Source Code
70-
uses: actions/checkout@v3
70+
uses: actions/checkout@v4
7171
with:
7272
ref: master
7373
- name: Login to OpenShift
@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-latest
8888
steps:
8989
- name: Checkout Source Code
90-
uses: actions/checkout@v3
90+
uses: actions/checkout@v4
9191
with:
9292
ref: master
9393
- name: Fetch Tags
@@ -109,7 +109,7 @@ jobs:
109109
runs-on: ubuntu-latest
110110
steps:
111111
- name: Checkout Source Code
112-
uses: actions/checkout@v3
112+
uses: actions/checkout@v4
113113
with:
114114
ref: master
115115
- name: Login to OpenShift

.github/workflows/credentials-comment-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
if: github.event.workflow_run.event == 'pull_request'
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
- name: Download artifact
1818
uses: actions/[email protected]
1919
with:

.github/workflows/credentials-scan.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717

1818
- name: Setup python
1919
uses: actions/setup-python@v2
@@ -45,7 +45,7 @@ jobs:
4545
echo ${{ github.event.pull_request.number }} > ./pr/NR
4646
./tools/cicd/build/secops_report.sh trufflehog_report.json > ./pr/PRBODY
4747
48-
- uses: actions/upload-artifact@v2
48+
- uses: actions/upload-artifact@v4
4949
if: always()
5050
with:
5151
name: pr
@@ -61,7 +61,7 @@ jobs:
6161

6262
- name: Upload HTML report
6363
if: failure()
64-
uses: actions/upload-artifact@v2
64+
uses: actions/upload-artifact@v4
6565
with:
6666
name: Security Scan Report
6767
path: trufflehog_report.html

.github/workflows/db-schma.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
working-directory: ./source/database/mssql/scripts/dbscripts
2121

2222
steps:
23-
- uses: actions/checkout@v1
23+
- uses: actions/checkout@v4
2424
- name: Set up random env variable
2525
run: |
2626
passvar=$(date +%s | sha256sum | base64 | head -c 29)A8!

.github/workflows/deploy-prod-end.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout Source Code
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
ref: master
2020
fetch-depth: 0

.github/workflows/deploy-prod-start.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
needs: ci-cd-start-notification
5353
steps:
5454
- name: Checkout Source Code
55-
uses: actions/checkout@v3
55+
uses: actions/checkout@v4
5656
with:
5757
ref: master
5858
fetch-depth: 0
@@ -85,7 +85,7 @@ jobs:
8585
runs-on: ubuntu-latest
8686
steps:
8787
- name: Checkout Source Code
88-
uses: actions/checkout@v3
88+
uses: actions/checkout@v4
8989
- name: Login to OpenShift
9090
uses: redhat-actions/oc-login@v1
9191
with:
@@ -108,7 +108,7 @@ jobs:
108108
runs-on: ubuntu-latest
109109
steps:
110110
- name: Checkout Source Code
111-
uses: actions/checkout@v3
111+
uses: actions/checkout@v4
112112
- name: Login to OpenShift
113113
uses: redhat-actions/oc-login@v1
114114
with:
@@ -129,7 +129,7 @@ jobs:
129129
runs-on: ubuntu-latest
130130
steps:
131131
- name: Checkout Source Code
132-
uses: actions/checkout@v3
132+
uses: actions/checkout@v4
133133

134134
- name: Setup .NET 8
135135
uses: actions/setup-dotnet@v3

0 commit comments

Comments
 (0)