From 322058107f173fce2455f0256598c9410ea2bd39 Mon Sep 17 00:00:00 2001 From: james Hart Date: Mon, 14 Oct 2024 17:23:22 +0100 Subject: [PATCH] end to end flow for build and deploy - first attempt --- .github/workflows/pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 8ef4221..e49a67e 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -55,7 +55,11 @@ permissions: jobs: helm_lint: name: helm lint +<<<<<<< HEAD uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@v1 # WORKFLOW_VERSION +======= + uses: ministryofjustice/hmpps-github-actions/.github/workflows/test_helm_lint.yml@main +>>>>>>> 415f7b6 (end to end flow for build and deploy - first attempt) secrets: inherit with: environment: ${{ inputs.environment || 'dev' }}