Skip to content

Commit

Permalink
Update missing references and add release notes
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewrlee committed Dec 9, 2024
1 parent b2be4d7 commit 37cafca
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ runs:
steps:
- uses: actions/checkout@v4
- name: Authenticate
uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/cloud-platform-auth@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/cloud-platform-auth@v2 # WORKFLOW_VERSION
with:
api: ${{ inputs.api }}
cert: ${{ inputs.cert }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/slack_failure_results/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
using: "composite"
steps:
- name: process slack message results # returns SLACK_TXT
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_prepare_results@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_prepare_results@v2 # WORKFLOW_VERSION
id: slack_message_result
with:
input_file: ${{ inputs.input_file }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
id: install
with:
version: latest
- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/cloud-platform-deploy@v1 # WORKFLOW_VERSION
- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/cloud-platform-deploy2 # WORKFLOW_VERSION
id: deploy
with:
environment: ${{ inputs.environment }}
Expand All @@ -44,7 +44,7 @@ jobs:
# Notification bit - always send prod releases to dps-releases - CVA3MKDTR
- if: ${{ inputs.environment == 'prod' || inputs.environment == 'production' }}
id: prod-dps-slack
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_release_results@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_release_results@v2 # WORKFLOW_VERSION
with:
channel_id: 'CVA3MKDTR'
environment: ${{ inputs.environment }}
Expand All @@ -56,7 +56,7 @@ jobs:
# Optional prod releases slack channel (using PROD_RELEASES_SLACK_CHANNEL variable)
- if: ${{ ( inputs.environment == 'prod' || inputs.environment == 'production' ) && vars.PROD_RELEASES_SLACK_CHANNEL != '' }}
id: prod-slack
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_release_results@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_release_results@v2 # WORKFLOW_VERSION
with:
channel_id: ${{ vars.PROD_RELEASES_SLACK_CHANNEL }}
environment: ${{ inputs.environment }}
Expand All @@ -67,7 +67,7 @@ jobs:
# Optional non-prod releases slack channel (using NONPROD_RELEASES_SLACK_CHANNEL variable)
- if: ${{ (inputs.environment != 'prod' && inputs.environment != 'production') && vars.NONPROD_RELEASES_SLACK_CHANNEL != '' }}
id: nonprod-slack
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_release_results@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_release_results@v2 # WORKFLOW_VERSION
with:
channel_id: ${{ vars.NONPROD_RELEASES_SLACK_CHANNEL }}
environment: ${{ inputs.environment }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:
steps:
- id: app_version
name: Application version creators
uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/create_app_version@v1 # WORKFLOW_VERSION
- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_docker@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/create_app_version@v2 # WORKFLOW_VERSION
- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_docker@v2 # WORKFLOW_VERSION
if: ${{ ( inputs.docker_registry == 'ghcr.io' ) && ( ! inputs.docker_multiplatform )}}
with:
repository_name: ${{ github.event.repository.name }}
Expand All @@ -60,7 +60,7 @@ jobs:
push: ${{ inputs.push }}
app_version: ${{ steps.app_version.outputs.version }}

- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_docker@v1 # WORKFLOW_VERSION
- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_docker@v2 # WORKFLOW_VERSION
if: ${{ ( inputs.docker_registry == 'quay.io' ) && ( ! inputs.docker_multiplatform )}}
with:
repository_name: ${{ github.event.repository.name }}
Expand All @@ -74,7 +74,7 @@ jobs:
# git_head_ref: ${{ github.head_ref }}
# git_branch_ref: ${{ github.ref_name }}

- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_multiplatform_docker@v1 # WORKFLOW_VERSION
- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_multiplatform_docker@v2 # WORKFLOW_VERSION
if: ${{ ( inputs.docker_registry == 'ghcr.io' ) && ( inputs.docker_multiplatform )}}
with:
repository_name: ${{ github.event.repository.name }}
Expand All @@ -84,7 +84,7 @@ jobs:
push: ${{ inputs.push }}
app_version: ${{ steps.app_version.outputs.version }}

- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_multiplatform_docker@v1 # WORKFLOW_VERSION
- uses: ministryofjustice/hmpps-github-actions/.github/actions/build-test-and-deploy/build_multiplatform_docker@v2 # WORKFLOW_VERSION
if: ${{ ( inputs.docker_registry == 'quay.io' ) && ( inputs.docker_multiplatform )}}
with:
repository_name: ${{ github.event.repository.name }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security_npm_dependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@ jobs:
- name: Process slack message results from npm better audit # returns SLACK_TXT
id: slack-message-result
if: steps.npm-better.outcome == 'failure' && inputs.channel_id != 'NO_SLACK'
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_prepare_results@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_prepare_results@v2 # WORKFLOW_VERSION
with:
input_file: npm-security-check-reports.txt
- name: npm audit slack notification
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_codescan_notification@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_codescan_notification@v2 # WORKFLOW_VERSION
if: (failure() || steps.npm.outcome == 'failure' || steps.npm-better.outcome == 'failure') && inputs.channel_id != 'NO_SLACK'
with:
title: "npm dependency scan"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security_npm_outdated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
id: npm
run: npm outdated ${{ inputs.dependencies_to_check }} > npm-outdated-reports.txt
continue-on-error: true
- uses: ministryofjustice/hmpps-github-actions/.github/actions/security_npm_outdated@v1 # WORKFLOW_VERSION
- uses: ministryofjustice/hmpps-github-actions/.github/actions/security_npm_outdated@v2 # WORKFLOW_VERSION
if: steps.npm.outcome == 'failure'
with:
channel_id: ${{ inputs.channel_id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security_owasp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
name: gradle-owasp-dependency-check-${{ inputs.subproject == '' && github.event.repository.name || inputs.subproject }}
path: ${{ inputs.subproject == '' && '.' || inputs.subproject }}/build/reports/dependency-check-report.html
- name: Gradle OWASP slack notification
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_codescan_notification@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_codescan_notification@v2 # WORKFLOW_VERSION
if: (failure() || steps.owasp-analyse.outcome == 'failure') && inputs.channel_id != 'NO_SLACK'
with:
title: "Gradle OWASP"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security_trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
sarif_file: 'trivy-results.sarif'
category: trivy-dependency-check
- name: Trivy slack notification
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_codescan_notification@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_codescan_notification@v2 # WORKFLOW_VERSION
if: (failure() || steps.trivy-analyse.outcome == 'failure') && inputs.channel_id != 'NO_SLACK'
with:
title: "Trivy"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security_veracode_pipeline_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
java-version: '21'
distribution: 'temurin'
- name: prepare assets
uses: ministryofjustice/hmpps-github-actions/.github/actions/security_veracode_prepare_artifacts@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/security_veracode_prepare_artifacts@v2 # WORKFLOW_VERSION
- name: "Download/Extract pipeline scanner"
shell: bash
run: |
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
path: results.txt
- name: send a failure slack message
if: steps.veracode-pipeline-scan.outcome == 'failure' && inputs.channel_id != 'NO_SLACK'
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_failure_results@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_failure_results@v2 # WORKFLOW_VERSION
with:
SLACK_BOT_TOKEN: ${{ secrets.HMPPS_SRE_SLACK_BOT_TOKEN }}
channel_id: ${{ inputs.channel_id }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security_veracode_policy_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
java-version: '21'
distribution: 'temurin'
- name: prepare assets
uses: ministryofjustice/hmpps-github-actions/.github/actions/security_veracode_prepare_artifacts@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/security_veracode_prepare_artifacts@v2 # WORKFLOW_VERSION
- name: "Download/Extract veracode agent"
run: wget https://repo1.maven.org/maven2/com/veracode/vosp/api/wrappers/vosp-api-wrappers-java/22.9.10.3/vosp-api-wrappers-java-22.9.10.3.jar -O VeracodeJavaAPI.jar
- name: "Upload to Veracode"
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
path: output.txt
- name: send a failure slack message
if: failure() && inputs.channel_id != 'NO_SLACK'
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_failure_results@v1 # WORKFLOW_VERSION
uses: ministryofjustice/hmpps-github-actions/.github/actions/slack_failure_results@v2 # WORKFLOW_VERSION
with:
SLACK_BOT_TOKEN: ${{ secrets.HMPPS_SRE_SLACK_BOT_TOKEN }}
channel_id: ${{ inputs.channel_id }}
Expand Down
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ Workflows and actions are referred to by the tags associated with the current re

When a new release is issued, all of these referred workflows (as well as the calling ones within applications) will need to be updated as well.

### Releasing

To perform a release:

* Update the WORKFLOW_VERSION across the project
* Ensure the `CHANGELOG.md` has been updated
* Create a pull request and get it merged
* Create tags for `vx`, `vx.y` and `vx.y.z`, e.g: `git tag v2`, `v2.0` and `v2.0.1`
* Force push all three tags to the repo
* Create a github release from the `vx.y.z` tag

### TODO

- Update the discovery tool to scan the version of Github Actions Workflows

0 comments on commit 37cafca

Please sign in to comment.