Merge branch 'main' into jfu/add-happy-config-set-action

chanzuckerberg · Jan 6, 2024 · a1d182a · a1d182a
2 parents 75f4e79 + f997e84
commit a1d182a
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 5 deletions.
diff --git a/.github/actions/conventional-commits/action.yml b/.github/actions/conventional-commits/action.yml
@@ -6,7 +6,7 @@ runs:
     - uses: actions/github-script@v5
       with:
         script: |
-          const validator = /^(chore|feat|fix|revert|docs|style)(\((((CCIE|CDI|PRODSEC|SECENG|ONCALL)-[0-9]+)|([a-z]+))\))?(!)?: (.)+$/
+          const validator = /^(chore|feat|fix|revert|docs|style)(\((((CCIE|CDI|PRODSEC|SECENG|ONCALL)-[0-9]+)|([a-z-]+))\))?(!)?: (.)+$/
           const title = context.payload.pull_request.title
           const is_valid = validator.test(title)
 

diff --git a/.github/actions/deploy-happy-stack/CHANGELOG.md b/.github/actions/deploy-happy-stack/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+### [1.17.1](https://github.com/chanzuckerberg/github-actions/compare/deploy-happy-stack-v1.17.0...deploy-happy-stack-v1.17.1) (2024-01-05)
+
+
+### Bug Fixes
+
+* only use slice flags when slice is set ([b10aa97](https://github.com/chanzuckerberg/github-actions/commit/b10aa97de100f0726e77015a1f7a492795dd645c))
+
+## [1.17.0](https://github.com/chanzuckerberg/github-actions/compare/deploy-happy-stack-v1.16.0...deploy-happy-stack-v1.17.0) (2024-01-04)
+
+
+### Features
+
+* add slice to happy deploy stack action ([#236](https://github.com/chanzuckerberg/github-actions/issues/236)) ([04dbac6](https://github.com/chanzuckerberg/github-actions/commit/04dbac6485f7644dd3c0fe189d0b9aa11cb7c77e))
+
 ## [1.16.0](https://github.com/chanzuckerberg/github-actions/compare/deploy-happy-stack-v1.15.0...deploy-happy-stack-v1.16.0) (2023-10-27)
 
 

diff --git a/.github/actions/deploy-happy-stack/action.yml b/.github/actions/deploy-happy-stack/action.yml
@@ -64,6 +64,13 @@ inputs:
   github-repo-branch:
     description: "Branch of Github repo to deploy"
     required: false
+  slice:
+    description: "Slice to deploy"
+    required: false
+  slice-default-tag:
+    description: "For stacks using slices, override the default tag for any images that aren't being built and pushed"
+    required: false
+    default: "latest"
 
 runs:
   using: "composite"
@@ -92,6 +99,8 @@ runs:
         IMAGE_SOURCE_ENV: ${{ inputs.image-source-env }}
         IMAGE_SOURCE_STACK: ${{ inputs.image-source-stack }}
         IMAGE_SOURCE_ROLE_ARN: ${{ inputs.image-source-role-arn }}
+        SLICE: ${{ inputs.slice }}
+        SLICE_DEFAULT_TAG: ${{ inputs.slice-default-tag }}
       shell: bash
       working-directory: ${{ inputs.working-directory }}
       run: |
@@ -129,6 +138,11 @@ runs:
         if [[ ${IMAGE_SOURCE_ROLE_ARN} != "" ]]; then
           HAPPY_DEPLOYMENT_FLAGS="$HAPPY_DEPLOYMENT_FLAGS --image-src-role-arn ${IMAGE_SOURCE_ROLE_ARN}"
         fi
+
+        if [[ ${SLICE} != "" ]]; then
+          HAPPY_DEPLOYMENT_FLAGS="$HAPPY_DEPLOYMENT_FLAGS --slice ${SLICE} --slice-default-tag ${SLICE_DEFAULT_TAG}"
+        fi
+
         echo "Starting to ${OPERATION} stack ${STACK_NAME} with additional flags: ${HAPPY_DEPLOYMENT_FLAGS}"
         echo "Running: '${OPERATION} --aws-profile "" --env=${ENV} ${HAPPY_DEPLOYMENT_FLAGS} ${STACK_NAME}'"
         happy ${OPERATION} --aws-profile "" --env=${ENV} ${HAPPY_DEPLOYMENT_FLAGS} ${STACK_NAME}
diff --git a/.github/actions/retag-happy/CHANGELOG.md b/.github/actions/retag-happy/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [1.4.1](https://github.com/chanzuckerberg/github-actions/compare/retag-happy-v1.4.0...retag-happy-v1.4.1) (2024-01-04)
+
+
+### Bug Fixes
+
+* happy addtags github action ([#230](https://github.com/chanzuckerberg/github-actions/issues/230)) ([0b740d8](https://github.com/chanzuckerberg/github-actions/commit/0b740d81436af68cb9af1011cab89199823c0161))
+
 ## [1.4.0](https://github.com/chanzuckerberg/github-actions/compare/retag-happy-v1.3.0...retag-happy-v1.4.0) (2023-07-24)
 
 

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -2,12 +2,12 @@
 	".github/actions/happy-cleanup": "1.5.0",
 	".github/actions/conventional-commits": "1.3.3",
 	".github/actions/docker-build-push": "1.4.0",
-	".": "1.26.0",
+	".": "1.27.1",
 	".github/actions/install-happy": "1.7.0",
-	".github/actions/deploy-happy-stack": "1.16.0",
+	".github/actions/deploy-happy-stack": "1.17.1",
 	".github/actions/get-github-ref-names": "1.4.0",
 	".github/actions/latest-successful-deployment": "1.3.0",
-	".github/actions/retag-happy": "1.4.0",
+	".github/actions/retag-happy": "1.4.1",
 	".github/actions/jira-find-marker": "1.0.1",
 	".github/actions/jira-validate-reference": "1.1.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+### [1.27.1](https://github.com/chanzuckerberg/github-actions/compare/v1.27.0...v1.27.1) (2024-01-05)
+
+
+### Bug Fixes
+
+* only use slice flags when slice is set ([b10aa97](https://github.com/chanzuckerberg/github-actions/commit/b10aa97de100f0726e77015a1f7a492795dd645c))
+
+## [1.27.0](https://github.com/chanzuckerberg/github-actions/compare/v1.26.0...v1.27.0) (2024-01-04)
+
+
+### Features
+
+* add slice to happy deploy stack action ([#236](https://github.com/chanzuckerberg/github-actions/issues/236)) ([04dbac6](https://github.com/chanzuckerberg/github-actions/commit/04dbac6485f7644dd3c0fe189d0b9aa11cb7c77e))
+
+
+### Bug Fixes
+
+* happy addtags github action ([#230](https://github.com/chanzuckerberg/github-actions/issues/230)) ([0b740d8](https://github.com/chanzuckerberg/github-actions/commit/0b740d81436af68cb9af1011cab89199823c0161))
+
 ## [1.26.0](https://github.com/chanzuckerberg/github-actions/compare/v1.25.0...v1.26.0) (2023-10-27)
 
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.26.0
+1.27.1