Skip to content

Commit

Permalink
Merge branch 'main' into story/ccmspui-530_get_notification
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Briggs authored Feb 6, 2025
2 parents 328a213 + 3ba9643 commit 9e0c0d3
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 55 deletions.
150 changes: 150 additions & 0 deletions .github/workflows/feature-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
name: CI feature branch and deploy

on:
push:
branches:
- 'feature-dev/**'
- 'feature-test/**'

permissions:
contents: read
packages: write

jobs:
define-image-tag:
runs-on: ubuntu-latest
outputs:
repo_name: ${{ steps.extract_repo_name.outputs.repo_name }}
steps:
- name: Extract short repo name
shell: bash
run: echo "repo_name=caab-ebs${GITHUB_REPOSITORY#*\/laa-ccms-data}" >> $GITHUB_OUTPUT
id: extract_repo_name

build-test-publish:
runs-on: ubuntu-latest
outputs:
app_version: ${{ steps.capture_version.outputs.app_version }}
steps:
- uses: actions/checkout@v3

- name: Capture version
shell: bash
id: capture_version
run: |
BRANCH_NAME=${GITHUB_REF_NAME#feature-*/}
COMMIT_HASH=$(git rev-parse --short HEAD)
echo "${BRANCH_NAME}-${COMMIT_HASH}-SNAPSHOT"
echo "app_version=${BRANCH_NAME}-${COMMIT_HASH}-SNAPSHOT" >> $GITHUB_OUTPUT
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '21'
distribution: 'temurin'
- name: Build with Gradle
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: build -Pversion=${{ steps.capture_version.outputs.app_version }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Test
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: jacocoTestCoverageVerification -Pversion=${{ steps.capture_version.outputs.app_version }}

- name: Integration Test
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: integrationTest -Pversion=${{ steps.capture_version.outputs.app_version }}

- name: Publish package
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: publish -Pversion=${{ steps.capture_version.outputs.app_version }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload jarfile
uses: actions/upload-artifact@v4
with:
name: data-api-jar
path: data-service/build/libs/data-service-${{ steps.capture_version.outputs.app_version }}.jar

ecr:
needs: [ build-test-publish, define-image-tag ]
runs-on: ubuntu-latest
permissions:
id-token: write # for requesting jwt
contents: read # for actions/checkout
steps:
- uses: actions/checkout@v3

- name: Download jar
uses: actions/download-artifact@v4
with:
name: data-api-jar

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v2
with:
role-to-assume: ${{ secrets.ECR_ROLE_TO_ASSUME }}
aws-region: ${{ vars.ECR_REGION }}

- name: Login ECR
uses: aws-actions/amazon-ecr-login@v1
id: login-ecr

- name: Build and push image
env:
REGISTRY: ${{ steps.login-ecr.outputs.registry }}
REPOSITORY: ${{ vars.ECR_REPOSITORY }}
REPO_NAME: ${{ needs.define-image-tag.outputs.repo_name }}
APP_VERSION: ${{ needs.build-test-publish.outputs.app_version }}
run: |
docker build --build-arg app_version=${{ env.APP_VERSION }} -t $REGISTRY/$REPOSITORY:${{ env.REPO_NAME }}-${{ env.APP_VERSION }} .
docker push $REGISTRY/$REPOSITORY:${{ env.REPO_NAME }}-${{ env.APP_VERSION }}
- name: Delete artifact
uses: geekyeggo/delete-artifact@v2
with:
name: data-api-jar

update-helm-chart:
needs: [ build-test-publish, ecr, define-image-tag ]
runs-on: ubuntu-latest
steps:
- name: Checkout charts repo
uses: actions/checkout@v3
with:
repository: ministryofjustice/laa-ccms-caab-helm-charts
ref: development
path: laa-ccms-caab-helm-charts
token: ${{ secrets.REPO_TOKEN }}

- name: Update Helm chart
env:
FEATURE_BRANCH: ${{ github.ref_name }}
REPO_NAME: ${{ needs.define-image-tag.outputs.repo_name }}
APP_VERSION: ${{ needs.build-test-publish.outputs.app_version }}
run: |
cd laa-ccms-caab-helm-charts
git config --global user.email "github@justice.gov.uk"
git config --global user.name "GitHub Actions Bot"
git fetch origin
if git rev-parse --verify origin/$FEATURE_BRANCH; then
git checkout $FEATURE_BRANCH
git pull origin $FEATURE_BRANCH
else
git checkout -b $FEATURE_BRANCH
fi
cd laa-ccms-caab-service/charts/caab-ebs-api/
yq eval "( .appVersion = \"${REPO_NAME}-${APP_VERSION}\" )" -i Chart.yaml
git add .
git commit -m "Update appVersion to ${REPO_NAME}-${APP_VERSION}"
git push --set-upstream origin $FEATURE_BRANCH
62 changes: 8 additions & 54 deletions .github/workflows/on-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: echo "repo_name=caab-ebs${GITHUB_REPOSITORY#*\/laa-ccms-data}" >> $GITHUB_OUTPUT
id: extract_repo_name

build-test-publish:
assemble-publish:
runs-on: ubuntu-latest
outputs:
app_version: ${{ steps.capture_version.outputs.app_version }}
Expand All @@ -43,20 +43,10 @@ jobs:
- name: Build with Gradle
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: build
arguments: assemble
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Test
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: jacocoTestCoverageVerification

- name: Integration Test
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
arguments: integrationTest

- name: Publish package
uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
with:
Expand All @@ -73,13 +63,13 @@ jobs:
echo "Captured version: $VERSION"
- name: Upload jarfile
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: data-api-jar
path: data-service/build/libs/data-service-${{ steps.capture_version.outputs.app_version }}.jar

ecr:
needs: [ build-test-publish, define-image-tag ]
needs: [ assemble-publish, define-image-tag ]
runs-on: ubuntu-latest
permissions:
id-token: write # for requesting jwt
Expand All @@ -89,7 +79,7 @@ jobs:
- uses: actions/checkout@v3
# Assume role in cloud platform
- name: download jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: data-api-jar

Expand All @@ -109,7 +99,7 @@ jobs:
REGISTRY: ${{ steps.login-ecr.outputs.registry }}
REPOSITORY: ${{ vars.ECR_REPOSITORY }}
REPO_NAME: ${{ needs.define-image-tag.outputs.repo_name }}
APP_VERSION: ${{ needs.build-test-publish.outputs.app_version }}
APP_VERSION: ${{ needs.assemble-publish.outputs.app_version }}
run: |
echo "Captured version: ${{ env.APP_VERSION }}"
docker build --build-arg app_version=${{ env.APP_VERSION }} -t $REGISTRY/$REPOSITORY:${{ env.REPO_NAME }}-${{ env.APP_VERSION }} .
Expand All @@ -121,7 +111,7 @@ jobs:
name: data-api-jar

update-helm-chart:
needs: [ build-test-publish, ecr, define-image-tag ]
needs: [ assemble-publish, ecr, define-image-tag ]
runs-on: ubuntu-latest
steps:
- name: Checkout charts repo
Expand All @@ -134,7 +124,7 @@ jobs:
- name: update helm chart
env:
REPO_NAME: ${{ needs.define-image-tag.outputs.repo_name }}
APP_VERSION: ${{ needs.build-test-publish.outputs.app_version }}
APP_VERSION: ${{ needs.assemble-publish.outputs.app_version }}
run: |
echo "${{ env.REPO_NAME }}-${{ env.APP_VERSION }}"
cd laa-ccms-caab-helm-charts/laa-ccms-caab-service/charts/caab-ebs-api/
Expand All @@ -144,39 +134,3 @@ jobs:
git add .
git commit -m "update appVersion to ${{ env.REPO_NAME }}-${{ env.APP_VERSION }}"
git push origin
update-laa-ccms-caab-ui:
needs: [ build-test-publish, define-image-tag ]
runs-on: ubuntu-latest
steps:
- name: Checkout caab-ui repo
uses: actions/checkout@v3
with:
repository: ministryofjustice/laa-ccms-caab
ref: main
token: ${{ secrets.REPO_TOKEN }}

- name: Create a new branch
env:
APP_VERSION: ${{ needs.build-test-publish.outputs.app_version }}
run: |
git checkout -b dependency/update-data-api-version-${APP_VERSION}
- name: Update gradle build file
env:
APP_VERSION: ${{ needs.build-test-publish.outputs.app_version }}
run: |
sed -i "s/uk.gov.laa.ccms.data:data-api:[^']*/uk.gov.laa.ccms.data:data-api:${APP_VERSION}/g" build.gradle
- name: Commit and push changes
env:
APP_VERSION: ${{ needs.build-test-publish.outputs.app_version }}
run: |
git config --global user.email "github@justice.gov.uk"
git config --global user.name "GitHub Actions Bot"
git add build.gradle
git commit -m "Update data-api version to ${APP_VERSION}"
git push origin dependency/update-data-api-version-${APP_VERSION}
gh auth login --with-token <<< "${{ secrets.REPO_TOKEN }}"
gh pr create --base main --head dependency/update-data-api-version-${APP_VERSION} --title "Update data-api version to ${APP_VERSION}" --body "Automatic PR raised by GitHub Actions to update data-api version to ${APP_VERSION}"
2 changes: 2 additions & 0 deletions .github/workflows/push-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
push:
branches-ignore:
- main
- 'feature-dev/*'
- 'feature-test/*'

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=0.0.37-SNAPSHOT
version=0.0.39-SNAPSHOT
group='uk.gov.laa.ccms'
repositoryName=laa-ccms-data-api

0 comments on commit 9e0c0d3

Please sign in to comment.