Fix github action

cds-snc · Oct 30, 2023 · e8af1c5 · e8af1c5
1 parent c17c907
commit e8af1c5
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 80 deletions.
diff --git a/.github/workflows/compile-and-publish.yml b/.github/workflows/compile-and-publish.yml
@@ -29,17 +29,10 @@ jobs:
 
     steps:
       - name: Git Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - name: Setup Node
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
-=======
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Setup Node
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
->>>>>>> develop
         with:
           node-version: 18
 
@@ -52,23 +45,15 @@ jobs:
         working-directory: ${{ matrix.package }}
 
       - name: Publish ${{ matrix.name }}
-<<<<<<< HEAD
-        uses: JS-DevTools/npm-publish@0897172f266b017b55f0d68271c4d9124eb20c69
-=======
         uses: JS-DevTools/npm-publish@4b07b26a2f6e0a51846e1870223e545bae91c552
->>>>>>> develop
         id: publish
         with:
           token: ${{ secrets.NPM_TOKEN }}
           package: ${{ matrix.dist }}
 
       - name: Configure AWS credentials using OIDC
         if: steps.publish.outputs.id != ''
-<<<<<<< HEAD
-        uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # v3.0.1
-=======
         uses: aws-actions/configure-aws-credentials@50ac8dd1e1b10d09dac7b8727528b91bed831ac0 # v3.0.2
->>>>>>> develop
         with:
           role-to-assume: arn:aws:iam::307395567143:role/gcds-components-apply
           role-session-name: CDNPublish
@@ -124,17 +109,10 @@ jobs:
             dist: "./packages/angular/dist"
     steps:
       - name: Git Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - name: Setup Node
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
-=======
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Setup Node
         uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
->>>>>>> develop
         with:
           node-version: 18
 
@@ -158,23 +136,15 @@ jobs:
         working-directory: ${{ matrix.package }}
 
       - name: Publish ${{ matrix.name }}
-<<<<<<< HEAD
-        uses: JS-DevTools/npm-publish@0897172f266b017b55f0d68271c4d9124eb20c69
-=======
         uses: JS-DevTools/npm-publish@4b07b26a2f6e0a51846e1870223e545bae91c552
->>>>>>> develop
         id: publish
         with:
           token: ${{ secrets.NPM_TOKEN }}
           package: ${{ matrix.dist }}
 
       - name: Configure AWS credentials using OIDC
         if: steps.publish.outputs.id != ''
-<<<<<<< HEAD
-        uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # v3.0.1
-=======
         uses: aws-actions/configure-aws-credentials@50ac8dd1e1b10d09dac7b8727528b91bed831ac0 # v3.0.2
->>>>>>> develop
         with:
           role-to-assume: arn:aws:iam::307395567143:role/gcds-components-apply
           role-session-name: CDNPublish

diff --git a/.github/workflows/export_github_data.yml b/.github/workflows/export_github_data.yml
@@ -14,11 +14,7 @@ jobs:
           DNS_PROXY_FORWARDTOSENTINEL: "true"
           DNS_PROXY_LOGANALYTICSWORKSPACEID: ${{ secrets.LOG_ANALYTICS_WORKSPACE_ID }}
           DNS_PROXY_LOGANALYTICSSHAREDKEY: ${{ secrets.LOG_ANALYTICS_WORKSPACE_KEY }}
-<<<<<<< HEAD
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-=======
       - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
->>>>>>> develop
       - name: Export Data
         uses: cds-snc/github-repository-metadata-exporter@main
         with:

diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml
@@ -20,20 +20,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-<<<<<<< HEAD
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-=======
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
->>>>>>> develop
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-<<<<<<< HEAD
-        uses: ossf/scorecard-action@15cd9b93234be290bb53536994caf52baed54dc4
-=======
         uses: ossf/scorecard-action@2fa1e2fa153141e2950c7e1299ed05e2081ead0c
->>>>>>> develop
         with:
           results_file: ossf-results.json
           results_format: json

diff --git a/.github/workflows/publish-storybook-staging.yml b/.github/workflows/publish-storybook-staging.yml
@@ -17,15 +17,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
-=======
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
->>>>>>> develop
         with:
           node-version: 18
 

diff --git a/.github/workflows/publish-storybook.yml b/.github/workflows/publish-storybook.yml
@@ -17,15 +17,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
-=======
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
->>>>>>> develop
         with:
           node-version: 18
 

diff --git a/.github/workflows/renovate-pr-build.yml b/.github/workflows/renovate-pr-build.yml
@@ -16,15 +16,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
-=======
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
->>>>>>> develop
         with:
           node-version: 18
 
@@ -73,15 +67,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
-=======
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
->>>>>>> develop
         with:
           node-version: 18
 

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -11,15 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-<<<<<<< HEAD
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d
-=======
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
->>>>>>> develop
         with:
           node-version: 18
 

diff --git a/.github/workflows/s3-backup.yml b/.github/workflows/s3-backup.yml
@@ -10,20 +10,12 @@ jobs:
     steps:
 
     - name: Checkout
-<<<<<<< HEAD
-      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-=======
       uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
->>>>>>> develop
       with:
         fetch-depth: 0 # retrieve all history
 
     - name: Configure AWS credentials
-<<<<<<< HEAD
-      uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # v3.0.1
-=======
       uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
->>>>>>> develop
       with:
         aws-access-key-id: ${{ secrets.AWS_S3_BACKUP_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_S3_BACKUP_SECRET_ACCESS_KEY }}