fix workflow

Author: anthony-nhs

.github/workflows/ci.yml

@@ -66,18 +66,18 @@ jobs:
     needs: [tag_release, quality_checks, get_commit_id]
     uses: ./.github/workflows/docker_image_build.yml
     with:
-      VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
+      VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
 
   release_dev:
     needs: [tag_release, package_code, get_commit_id]
     uses: ./.github/workflows/docker_image_upload.yml
     with:
       AWS_ENVIRONMENT: dev
-      VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
+      VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
-      TAG_LATEST: true
-      DOCKER_IMAGE_TAG: ${{needs.tag_release.outputs.version_tag}}
+      TAG_LATEST: false
+      DOCKER_IMAGE_TAG: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
     secrets:
       CDK_PUSH_IMAGE_ROLE: ${{ secrets.DEV_CDK_PUSH_IMAGE_ROLE }}
 
@@ -86,10 +86,10 @@ jobs:
     uses: ./.github/workflows/docker_image_upload.yml
     with:
       AWS_ENVIRONMENT: qa
-      VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
+      VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
-      TAG_LATEST: true
-      DOCKER_IMAGE_TAG: ${{needs.tag_release.outputs.version_tag}}
+      TAG_LATEST: false
+      DOCKER_IMAGE_TAG: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
     secrets:
       CDK_PUSH_IMAGE_ROLE: ${{ secrets.QA_CDK_PUSH_IMAGE_ROLE }}
 
@@ -98,9 +98,13 @@ jobs:
     uses: ./.github/workflows/docker_image_upload.yml
     with:
       AWS_ENVIRONMENT: ref
-      VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
+      VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
-      TAG_LATEST: true
-      DOCKER_IMAGE_TAG: ${{needs.tag_release.outputs.version_tag}}
+      TAG_LATEST: false
+      DOCKER_IMAGE_TAG: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
     secrets:
       CDK_PUSH_IMAGE_ROLE: ${{ secrets.REF_CDK_PUSH_IMAGE_ROLE }}
+
+  package_npm_code:
+    needs: [quality_checks, get_commit_id]
+    uses: ./.github/workflows/package_npm_code.yml

.github/workflows/pull_request.yml

@@ -92,7 +92,7 @@ jobs:
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
 
   package_npm_code:
-    needs: [get_issue_number, quality_checks, get_commit_id]
+    needs: [quality_checks, get_commit_id]
     uses: ./.github/workflows/package_npm_code.yml
 
   release_docker_image:

README.md

@@ -9,6 +9,13 @@ This repository contains a docker image used to deploy CDK to our environments a
 - `scripts/` Utilities helpful to developers of this specification
 - `.github/` Contains GitHub workflows that are used for building and deploying from pull requests and releases
 
+## Releases
+A release of this code happens automatically every Wednesday, but can also be triggered manually by running the release workflow.   
+The release workflow does the following
+ - creates a new tagged version
+ - creates a new version of the cdk construct library and publishes it to github
+ - pushes the cdk-utils docker image to dev and all other environments (subject to manual release approval in github actions)
+
 ## CDK Constructs
 
 This contains common CDK constructs used in EPS projects.