end to end flow for build and deploy - first attempt

ministryofjustice · Oct 17, 2024 · 3220581 · 3220581
1 parent abcc65f
commit 3220581
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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' }}