Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean-up pipeline config #76

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Clean-up pipeline config #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/deploy_to_env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,33 +31,33 @@ jobs:
build_docker:
if: ${{ inputs.image_tag == '' }}
name: Build docker image
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_build.yml@v2
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_build.yml@upload-image-to-artifacts
with:
docker_registry: 'ghcr.io'
registry_org: 'ministryofjustice'
tag_latest: false
push: true
docker_multiplatform: false

deploy_env_prebuilt:
if: ${{ inputs.image_tag != '' }}
name: Deploy pre-built image to environment
deploy_env:
if: ${{ inputs.image_tag == '' }}
name: Deploy to environment
needs:
- helm_lint
- build_docker
uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2
secrets: inherit
with:
environment: ${{ inputs.environment }}
app_version: ${{ inputs.image_tag }}
app_version: ${{ needs.build_docker.outputs.app_version }}

deploy_env:
if: ${{ inputs.image_tag == '' }}
name: Deploy to environment
deploy_env_prebuilt:
if: ${{ inputs.image_tag != '' }}
name: Deploy pre-built image to environment
needs:
- helm_lint
- build_docker
uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2
secrets: inherit
with:
environment: ${{ inputs.environment }}
app_version: ${{ needs.build_docker.outputs.app_version }}
app_version: ${{ inputs.image_tag }}
3 changes: 2 additions & 1 deletion .github/workflows/pipeline_main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@ jobs:
load: true
docker_multiplatform: false
upload_image_artifact: true
image_artifact_retention_days: 2

e2e_test:
needs: build_docker
uses: ministryofjustice/hmpps-assess-risks-and-needs-oastub-ui/.github/workflows/e2e_test.yml@add-e2e-to-pipeline
uses: ./.github/workflows/e2e_test.yml
with:
app_version: ${{ needs.build_docker.outputs.app_version }}

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pipeline_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ jobs:
upload_image_artifact: true
image_artifact_retention_days: 2


e2e_test:
needs: [build_docker]
uses: ministryofjustice/hmpps-assess-risks-and-needs-oastub-ui/.github/workflows/e2e_test.yml@add-e2e-to-pipeline
uses: ./.github/workflows/e2e_test.yml
with:
app_version: ${{ needs.build_docker.outputs.app_version }}
Loading