Skip to content

Commit

Permalink
Merge pull request #2260 from ministryofjustice/LPAL-1333-reenable-ar…
Browse files Browse the repository at this point in the history
…tifact-upload

LPAL-1333 re-enable upload-artifact with overwrite option
  • Loading branch information
nickdavis2001 authored Feb 4, 2025
2 parents 8f95afc + 53778a0 commit c347e9d
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 36 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/cypress_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ jobs:
npm install .
./cypress/cypress_start.sh
# Note - V 3 of upload-artifact is deprecated but V 4 disallows uploading artifact of the same name. Commented for now but needs rework
#- name: Upload Screenshot Artifact
# if: failure()
# uses: actions/[email protected]
# with:
# name: cypress-screenshots
# path: cypress/screenshots/
- name: Upload Screenshot Artifact
if: failure()
uses: actions/[email protected]
with:
name: cypress-screenshots
path: cypress/screenshots/
overwrite: true

- name: Configure AWS Credentials
if: always()
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ jobs:
run: XDEBUG_MODE=coverage php ./vendor/bin/phpunit --coverage-html ./coverage-html --coverage-xml ./coverage-xml
- name: Check coverage
run: php ../scripts/pipeline/php_coverage/check_coverage.php ./coverage-xml/index.xml ${{ matrix.scan.minCoverage }}
# Note - V 3 of upload-artifact is deprecated but V 4 disallows uploading artifact of the same name. Commented for now but needs rework
#- name: Upload Coverage Artifacts
# uses: actions/[email protected]
# with:
# name: coverage-html
# path: ${{ matrix.scan.path }}/coverage-html/
- name: Upload Coverage Artifacts
uses: actions/[email protected]
with:
name: coverage-html
path: ${{ matrix.scan.path }}/coverage-html/
overwrite: true
phpunit_all_services:
name: phpunit
runs-on: ubuntu-latest
Expand Down Expand Up @@ -104,9 +104,9 @@ jobs:
run: XDEBUG_MODE=coverage php ./vendor/bin/phpunit --coverage-html ./coverage-html --coverage-xml ./coverage-xml
- name: Check coverage
run: php ../scripts/pipeline/php_coverage/check_coverage.php ./coverage-xml/index.xml ${{ matrix.scan.minCoverage }}
# Note - V 3 of upload-artifact is deprecated but V 4 disallows uploading artifact of the same name. Commented for now but needs rework
#- name: Upload Coverage Artifacts
# uses: actions/[email protected]
# with:
# name: coverage-html
# path: ${{ matrix.scan.path }}/coverage-html/
- name: Upload Coverage Artifacts
uses: actions/[email protected]
with:
name: coverage-html
path: ${{ matrix.scan.path }}/coverage-html/
overwrite: true
12 changes: 6 additions & 6 deletions .github/workflows/workflow_path_to_live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
name: TF Preproduction - Account
needs:
- set_variables
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
with:
terraform_version: ${{ needs.set_variables.outputs.account_terraform_version }}
terraform_workspace: preproduction
Expand All @@ -105,7 +105,7 @@ jobs:

terraform_region_preproduction:
name: TF Preproduction - Region
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- set_variables
with:
Expand All @@ -123,7 +123,7 @@ jobs:

terraform_environment_preproduction:
name: TF Preproduction - Environment
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
with:
terraform_version: ${{ needs.set_variables.outputs.environment_terraform_version }}
terraform_workspace: preproduction
Expand Down Expand Up @@ -323,7 +323,7 @@ jobs:

terraform_account_production:
name: TF Production - Account
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- slack_msg_production_deploy_begin
- set_variables
Expand All @@ -342,7 +342,7 @@ jobs:

terraform_region_production:
name: TF Production - Region
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- slack_msg_production_deploy_begin
- set_variables
Expand All @@ -361,7 +361,7 @@ jobs:

terraform_environment_production:
name: TF Production - Environment
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
with:
terraform_version: ${{ needs.set_variables.outputs.environment_terraform_version }}
terraform_workspace: production
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/workflow_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
name: TF - Lint
needs:
- workflow_variables
uses: ministryofjustice/opg-github-workflows/.github/workflows/linting-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/linting-infrastructure-terraform.yml@v3.6.0
with:
terraform_version: ${{ needs.workflow_variables.outputs.environment_terraform_version }}

Expand All @@ -97,7 +97,7 @@ jobs:

terraform_account_development:
name: TF Development - Account
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- terraform_lint
- workflow_variables
Expand All @@ -118,7 +118,7 @@ jobs:

terraform_region_development:
name: TF Development - Region
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- terraform_lint
- workflow_variables
Expand All @@ -139,7 +139,7 @@ jobs:

terraform_email_development:
name: TF Development - Email
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- terraform_lint
- workflow_variables
Expand All @@ -160,7 +160,7 @@ jobs:

terraform_environment_development:
name: TF Development - Environment
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- docker_build_scan_push
- phpunit_tests
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:

terraform_account_preproduction:
name: TF Preproduction Plan - Account
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- workflow_variables
- terraform_lint
Expand All @@ -209,7 +209,7 @@ jobs:

terraform_region_preproduction:
name: TF Preproduction Plan - Region
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- workflow_variables
- terraform_lint
Expand All @@ -230,7 +230,7 @@ jobs:

terraform_environment_preproduction:
name: TF Preproduction Plan - Environment
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- workflow_variables
- terraform_lint
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/workflow_weekly_refresh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:

terraform_account_production:
name: TF Production - Account
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- slack_msg_production_deploy_begin
- set_variables
Expand All @@ -146,7 +146,7 @@ jobs:

terraform_region_production:
name: TF Production - Region
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- slack_msg_production_deploy_begin
- set_variables
Expand All @@ -165,7 +165,7 @@ jobs:

terraform_environment_production:
name: TF Production - Environment
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.5.0
uses: ministryofjustice/opg-github-workflows/.github/workflows/build-infrastructure-terraform.yml@v3.6.0
needs:
- docker_build_scan_push
- slack_msg_production_deploy_begin
Expand Down

0 comments on commit c347e9d

Please sign in to comment.