Skip to content

Commit

Permalink
Merge pull request #3282 from devinleighsmith/backmerge_test_to_dev
Browse files Browse the repository at this point in the history
Backmerge test to dev
  • Loading branch information
asanchezr authored Jun 22, 2023
2 parents 3def3bb + 7f3f393 commit f6399fb
Show file tree
Hide file tree
Showing 125 changed files with 1,999 additions and 372 deletions.
8 changes: 4 additions & 4 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@v2
- uses: actions/checkout@v3
- uses: dorny/paths-filter@v2
id: filter
with:
Expand All @@ -32,11 +32,11 @@ jobs:
GIT_BRANCH: "${{github.ref}}"

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

- name: Extract Branch Name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch

- name: Setup .NET 6
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
env:
MS_TEAMS_NOTIFY_URL: ${{ secrets.MS_TEAMS_NOTIFY_URL }}
if: env.MS_TEAMS_NOTIFY_URL != '' && failure() && steps.scan.outcome == 'failure'
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_NOTIFY_URL }}
Expand Down
10 changes: 5 additions & 5 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@v2
- uses: actions/checkout@v3
- uses: dorny/paths-filter@v2
id: filter
with:
Expand All @@ -32,15 +32,15 @@ jobs:
GIT_BRANCH: "${{github.ref}}"

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

- name: Extract Branch Name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
id: extract_branch

- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: "16.15.0"
- run: npm ci
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
env:
MS_TEAMS_NOTIFY_URL: ${{ secrets.MS_TEAMS_NOTIFY_URL }}
if: env.MS_TEAMS_NOTIFY_URL != '' && failure() && steps.scan.outcome == 'failure'
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_NOTIFY_URL }}
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 @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Start notification to Teams Channel
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
Expand All @@ -48,7 +48,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -85,7 +85,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Login to OpenShift
uses: redhat-actions/oc-login@v1
with:
Expand All @@ -105,10 +105,10 @@ jobs:
if: ${{ always() && github.event.pull_request.merged == true }}
steps:
- name: check workflow status
uses: martialonline/workflow-status@v2
uses: martialonline/workflow-status@v4
id: check
- name: End notification to Teams Channel
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci-cd-pims-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Start notification to Teams Channel
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
Expand All @@ -46,7 +46,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
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@v2
uses: actions/checkout@v3
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@v2
uses: actions/checkout@v3
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@v2
uses: actions/checkout@v3
with:
ref: master
- name: Login to OpenShift
Expand All @@ -130,10 +130,10 @@ jobs:
needs: deploy
steps:
- name: check workflow status
uses: martialonline/workflow-status@v2
uses: martialonline/workflow-status@v4
id: check
- name: End notification to Teams Channel
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci-cd-pims-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Start notification to Teams Channel
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
Expand All @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: test
- name: Login to OpenShift
Expand All @@ -71,7 +71,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: test
- name: Login to OpenShift
Expand All @@ -91,7 +91,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: test
- name: Fetch Tags
Expand All @@ -113,7 +113,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: test
- name: Login to OpenShift
Expand All @@ -135,10 +135,10 @@ jobs:
if: ${{ always() && github.event.pull_request.merged == true }}
steps:
- name: check workflow status
uses: martialonline/workflow-status@v2
uses: martialonline/workflow-status@v4
id: check
- name: End notification to Teams Channel
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
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@v2
- uses: actions/checkout@v3
- name: Download artifact
uses: actions/github-script@v3.1.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .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@v2
- uses: actions/checkout@v3

- name: Setup python
uses: actions/setup-python@v2
Expand Down
6 changes: 3 additions & 3 deletions .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@v2
uses: actions/checkout@v3
with:
ref: master
fetch-depth: 0
Expand All @@ -35,10 +35,10 @@ jobs:
needs: maintenance-page
steps:
- name: check workflow status
uses: martialonline/workflow-status@v2
uses: martialonline/workflow-status@v4
id: check
- name: End notification to Teams Channel
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/depoy-prod-start.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Start notification to Teams Channel
uses: jdcargile/ms-teams-notification@v1.3
uses: dragos-cojocari/ms-teams-notification@v1.0.2
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ env.MS_TEAMS_WEBHOOK_BUILD_CHANNEL }}
Expand All @@ -48,7 +48,7 @@ jobs:
needs: ci-cd-start-notification
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: master
fetch-depth: 0
Expand Down
Loading

0 comments on commit f6399fb

Please sign in to comment.