Version and other minor changes

Author: robbailiff2

.github/workflows/cicd-1-pull-request.yaml

@@ -39,7 +39,8 @@ jobs:
           echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
           echo "python_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
           echo "terraform_version=$(grep "^terraform" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)" >> $GITHUB_OUTPUT
+          echo "version=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+#          echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)" >> $GITHUB_OUTPUT
       - name: "Check if pull request exists for this branch"
         id: pr_exists
         env:

.github/workflows/cicd-2-publish.yaml

@@ -1,8 +1,7 @@
 name: "CI/CD publish"
 
 on:
-  pull_request:
-    types: [closed]
+  push:
     branches:
       - main
 
@@ -54,10 +53,12 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v4
+
       - name: "Get the artefacts"
         run: |
           echo "Getting the artefacts created by the build stage ..."
           # TODO: Use either action/cache or action/upload-artifact
+
       - name: "Create release"
         id: create_release
         uses: actions/create-release@v1

.github/workflows/manual-terraform-plan.yaml

@@ -1,4 +1,4 @@
-name: Github OIDC test
+name: Manual Terraform Plan
 
 on:
   workflow_dispatch:
@@ -35,6 +35,7 @@ jobs:
         run: |
           make dependencies install-python
           make build
+
       - name: "Upload lambda artefact"
         uses: actions/upload-artifact@v4
         with:
@@ -63,8 +64,8 @@ jobs:
 
         run: |
           mkdir -p ./build
-          echo "Running: make terraform env=$ENVIRONMENT workspace=$ENVIRONMENT stack=networking tf-command=plan args=\"-auto-approve\""
-          make terraform env=$ENVIRONMENT stack=networking tf-command=plan workspace=$ENVIRONMENT
+          echo "Running: make terraform env=$ENVIRONMENT workspace=$WORKSPACE stack=networking tf-command=plan args=\"-auto-approve\""
+          make terraform env=$ENVIRONMENT stack=networking tf-command=plan workspace=$WORKSPACE
           echo "Running: make terraform env=$ENVIRONMENT workspace=$WORKSPACE stack=api-layer tf-command=plan args=\"-auto-approve\""
           make terraform env=$ENVIRONMENT stack=api-layer tf-command=plan workspace=$WORKSPACE