Raise PR

ministryofjustice · Oct 18, 2023 · 67b2c5d · 67b2c5d
1 parent 902d797
commit 67b2c5d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 56 deletions.
diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml
@@ -5,7 +5,7 @@
 # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
 
-name: CI caab-data-api
+name: CI caab-data-api tag and deploy
 
 on:
   push:
@@ -127,7 +127,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: ministryofjustice/laa-ccms-caab-helm-charts
-          # TODO rename to develop
           ref: test
           path: laa-ccms-caab-helm-charts
           token: ${{ secrets.REPO_TOKEN }}
@@ -146,7 +145,7 @@ jobs:
           git push origin
 
   update-laa-ccms-caab-ui:
-    needs: [ build-test-publish, ecr, define-image-tag ]
+    needs: [ build-test-publish, define-image-tag ]
     runs-on: ubuntu-latest
     environment: development
     steps:
@@ -177,4 +176,7 @@ jobs:
           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}
+          git push origin dependency/update-data-api-version-${APP_VERSION}
+          
+          gh auth login --with-token <<< "${{ secrets.GITHUB_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}"
diff --git a/.github/workflows/pr-merge-main.yml b/.github/workflows/pr-merge-main.yml
@@ -5,7 +5,7 @@
 # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
 
-name: CI caab-data-api
+name: CI caab-data-api pr to main
 
 on:
   pull_request:

diff --git a/.github/workflows/push-branch-test.yml b/.github/workflows/push-branch-test.yml
diff --git a/.github/workflows/push-branch.yml b/.github/workflows/push-branch.yml
@@ -5,13 +5,12 @@
 # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
 
-name: CI caab-data-api
+name: CI caab-data-api push to branch
 
 on:
   push:
     branches-ignore:
       - main
-      - task/ccls-1880_amend_package_versions
 
 permissions:
   contents: read