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

ARN-2494 Set workflow version to v2 #79

Merged
merged 5 commits into from
Feb 20, 2025
Merged

ARN-2494 Set workflow version to v2 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff0ec49
ARN-2494 Set workflow version to v2
devkokov Feb 13, 2025
c3abedf
ARN-2494 Update repo
devkokov Feb 17, 2025
8e9c2de
ARN-2494 Pin workflow version
devkokov Feb 20, 2025
f89d9d5
ARN-2494 Update workflow names
devkokov Feb 20, 2025
5ecad99
Revert "ARN-2494 Pin workflow version"
devkokov Feb 20, 2025
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
8 changes: 4 additions & 4 deletions .github/workflows/deploy_to_env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ permissions:
jobs:
helm_lint:
name: helm lint
uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@v2
secrets: inherit
with:
environment: ${{ inputs.environment }}

build_docker:
if: ${{ inputs.image_tag == '' }}
name: Build docker image
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_build.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_build.yml@v2
with:
docker_registry: 'ghcr.io'
registry_org: 'ministryofjustice'
Expand All @@ -46,7 +46,7 @@ jobs:
needs:
- helm_lint
- build_docker
uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2
secrets: inherit
with:
environment: ${{ inputs.environment }}
Expand All @@ -57,7 +57,7 @@ jobs:
name: Deploy pre-built image to environment
needs:
- helm_lint
uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2
secrets: inherit
with:
environment: ${{ inputs.environment }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pipeline_main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Main pipeline [build -> test -> deploy]
name: Main

on:
push:
Expand All @@ -17,12 +17,12 @@ jobs:

node_build:
name: node build
uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_build.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_build.yml@v2
secrets: inherit

node_unit_tests:
name: node unit tests
uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_unit_tests.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_unit_tests.yml@v2
needs: node_build
secrets: inherit

Expand All @@ -31,14 +31,14 @@ jobs:
matrix:
environments: ['dev', 'test']
name: helm lint
uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@v2
secrets: inherit
with:
environment: ${{ matrix.environments }}

build_docker:
name: Build docker image
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_build.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_build.yml@v2
with:
docker_registry: 'ghcr.io'
registry_org: 'ministryofjustice'
Expand All @@ -63,7 +63,7 @@ jobs:
- build_docker
- e2e_test
- helm_lint
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_push.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_push.yml@v2
with:
docker_registry: 'ghcr.io'
registry_org: 'ministryofjustice'
Expand All @@ -75,7 +75,7 @@ jobs:
needs:
- build_docker
- publish_docker
uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/deploy_env.yml@v2
secrets: inherit
with:
environment: 'dev'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pipeline_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and test PR
name: PR

on:
pull_request:
Expand All @@ -10,12 +10,12 @@ concurrency:
jobs:
node_build:
name: Build
uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_build.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_build.yml@v2
secrets: inherit

node_unit_tests:
name: Unit tests
uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_unit_tests.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/node_unit_tests.yml@v2
needs: [node_build]
secrets: inherit

Expand All @@ -24,14 +24,14 @@ jobs:
strategy:
matrix:
environments: ['dev', 'test']
uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@v2
secrets: inherit
with:
environment: ${{ matrix.environments }}

build_docker:
name: Build docker image
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_build.yml@upload-image-to-artifacts
uses: ministryofjustice/hmpps-github-actions/.github/workflows/docker_build.yml@v2
with:
docker_registry: 'ghcr.io'
registry_org: 'ministryofjustice'
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
oasys-ui:
image: quay.io/hmpps/hmpps-assess-risks-and-needs-oastub-ui:local
image: ghcr.io/ministryofjustice/hmpps-assess-risks-and-needs-oastub-ui:local
build:
target: development
command: npm run start:dev
Expand Down
Loading