Merge pull request #3491 from CityOfBoston/develop

chore: Adds GitHub Actions for deployment.
CityOfBoston · May 24, 2024 · 887573c · 887573c
2 parents 0d1f490 + 33e8f28
commit 887573c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/config/deploy/deploy-from.txt b/.github/config/deploy/deploy-from.txt
@@ -8,3 +8,6 @@ scripts/deploy/cob_utilities.sh
 scripts/composer
 composer.lock
 composer.json
+
+.github/config/releaseNotesConfig.yml
+.github/workflows/D10-NotifyRelease.yml
diff --git a/.github/config/releaseNotesConfig.yml b/.github/config/releaseNotesConfig.yml
@@ -1,7 +1,7 @@
 username: 'Digital Team Notices'
 icon_url: https://boston.gov/digitalteamicon.png
 
-pretext: A production deployment has been completed and release notes have been published.
+pretext: A boston.gov deployment has been completed and release notes have been published.
 title: <{{payload.release.html_url}}|Code Release>
 title_link: {{payload.release.html_url}}
 
@@ -16,7 +16,7 @@ fallback: |-
 blocks:
   - type: "divider"
   - type: "header"
-    text: 
+    text:
       type: "plain_text"
       text: "Release Information"
   - type: section
@@ -26,7 +26,7 @@ blocks:
     - type: mrkdwn
       text: "Repository Tag\n{{payload.release.tag_name}}"
     - type: mrkdwn
-      text: "Release Date\n{{truncate payload.release.created_at 10}}"      
+      text: "Release Date\n{{truncate payload.release.created_at 10}}"
   - type: context
     elements:
       - type: image

diff --git a/.github/workflows/D10-GeneratePublicRelease.yml b/.github/workflows/D10-GeneratePublicRelease.yml
@@ -59,8 +59,8 @@ jobs:
           cd public
           git config --global user.email "${{ env.DEV_EMAIL }}"
           git config --global user.name "${{ env.USER }}"
-          git tag -a "${{ vars.THIS_TAG }}" -m "${{ env.RELEASE_NUMBER }}"
-          [ ${{ vars.DRY_RUN }} == 0 ] && git push origin ${{ vars.THIS_TAG }}
+          git tag -a "${{ vars.THIS_RELEASE }}" -m "${{ vars.THIS_RELEASE }}"
+          [ ${{ vars.DRY_RUN }} == 0 ] && git push origin ${{ vars.THIS_RELEASE }}
 
       # Create the GitHub PUBLIC repo Release Note.
       - name: Generate Release Notes
@@ -80,7 +80,7 @@ jobs:
           ### Release Notes
           ${{ env.RELEASE_NOTES }}" > ${{ env.WORKING_FILE }}
           options="--latest --generate-notes"
-          options="$options --notes-start-tag ${{ vars.LAST_TAG }}"
+          options="$options --notes-start-tag ${{ vars.LAST_RELEASE }}"
           options="$options --notes-file ${{ env.WORKING_FILE }}"
           options="$options --title ${{ env.RELEASE_NUMBER }}"
           [ ${{ env.DRAFT }} == 1 ] && options="--draft $options"

diff --git a/.github/workflows/D10-Publish.yml b/.github/workflows/D10-Publish.yml
@@ -102,6 +102,7 @@ jobs:
           [ -n "${{ github.event.pull_request.body }}" ] && BODY="${{ github.event.pull_request.body }}" || BODY="PR committed and merged."
           gh variable set COUNT --body $(( ${{ vars.COUNT }}+1 ))
           gh variable set LAST_TAG --body "${{ vars.THIS_TAG }}"
+          gh variable set LAST_RELEASE --body "${{ vars.THIS_RELEASE }}"
           gh variable set THIS_TAG --body "$ACQUIA_TAG"
           gh variable set THIS_RELEASE --body "$RELEASE_NUMBER"
           gh variable set THIS_TITLE --body "$TITLE"