From a472704429d25d6214392621c08f26e75e21956e Mon Sep 17 00:00:00 2001
From: Andrew Hosgood <andrew.hosgood@nationalarchives.gov.uk>
Date: Fri, 21 Jun 2024 12:47:54 +0100
Subject: [PATCH] Try new build script

---
 .github/workflows/cd.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index b810762..0b0cdc3 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,13 +1,11 @@
-name: CD
+name: Build and deploy
 
 on:
   workflow_dispatch:
   push:
-    branches:
-      - proof-of-concept
 
 concurrency:
-  group: cd
+  group: cd-${{ github.ref }}
 
 jobs:
   build:
@@ -27,3 +25,21 @@ jobs:
           latest: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
           docker-image-name: ${{ vars.DOCKER_IMAGE_NAME }}
+
+  build2:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - name: Create version tag
+        id: version-tag
+        uses: nationalarchives/ds-docker-actions/.github/actions/get-version-tag
+      - name: Build Docker image
+        uses: nationalarchives/ds-docker-actions/.github/actions/docker-build
+        with:
+          version: ${{ steps.version-tag.outputs.version-tag }}
+          latest: ${{ github.ref == 'refs/heads/main' }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          docker-image-name: ${{ vars.DOCKER_IMAGE_NAME }}
\ No newline at end of file