From 65eb0264a014271cac4d7568d159f2f121767899 Mon Sep 17 00:00:00 2001 From: steve-thorne-ONS Date: Thu, 18 Jun 2026 15:10:20 +0100 Subject: [PATCH 1/2] Remove image creation from workflows. --- .github/workflows/check-aims-diy-version.yml | 6 +- .github/workflows/check-version-bump.yml | 2 +- .github/workflows/create-test-image.yml | 65 ---------------- .github/workflows/merge-main.yml | 78 -------------------- .github/workflows/pull-request-main.yml | 6 +- version.txt | 2 +- 6 files changed, 8 insertions(+), 151 deletions(-) delete mode 100644 .github/workflows/create-test-image.yml delete mode 100644 .github/workflows/merge-main.yml diff --git a/.github/workflows/check-aims-diy-version.yml b/.github/workflows/check-aims-diy-version.yml index 7d8d783..48f7e73 100644 --- a/.github/workflows/check-aims-diy-version.yml +++ b/.github/workflows/check-aims-diy-version.yml @@ -15,10 +15,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout aims-api code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Checkout aims-diy repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: ONSdigital/aims-diy path: diy @@ -85,7 +85,7 @@ jobs: - name: Report as a check run if: steps.compare.outputs.behind == 'true' - uses: actions/github-script@v7 + uses: actions/github-script@v9 continue-on-error: true with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/check-version-bump.yml b/.github/workflows/check-version-bump.yml index c25a0f3..507d292 100644 --- a/.github/workflows/check-version-bump.yml +++ b/.github/workflows/check-version-bump.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the code - uses: actions/checkout@v5.0.0 + uses: actions/checkout@v6 with: fetch-depth: 0 # Ensures we have the full history for diff diff --git a/.github/workflows/create-test-image.yml b/.github/workflows/create-test-image.yml deleted file mode 100644 index ae0b494..0000000 --- a/.github/workflows/create-test-image.yml +++ /dev/null @@ -1,65 +0,0 @@ -name: Create a test image for AP - -on: - workflow_dispatch: - inputs: - version: - description: 'Version tag to assign to the Docker image' - required: true - default: '0.0.1' -env: - IMAGE_NAME: 'address-index-server-test' - PROJECT_ID: 'ons-ci-aims' - AR_REPO_LOCATION: 'europe-west2' - AR_URL: 'europe-west2-docker.pkg.dev/ons-ci-aims/aims-api-repository' - WORKLOAD_IDENTITY_PROVIDER: 'projects/709138365636/locations/global/workloadIdentityPools/github-actions-aims-pool/providers/aims-api-provider' -permissions: - contents: read - id-token: write -jobs: - build: - if: github.ref != 'refs/heads/main' - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v5.0.0 - - - name: Google Auth - id: auth - uses: 'google-github-actions/auth@v3' - with: - project_id: ${{ env.PROJECT_ID }} - workload_identity_provider: ${{ env.WORKLOAD_IDENTITY_PROVIDER }} - - - name: Set up JDK 21 - uses: actions/setup-java@v5.0.0 - with: - java-version: '21' - distribution: 'temurin' - cache: 'sbt' - - - name: Set up JDK 21 - uses: actions/setup-java@v5.0.0 - with: - java-version: '21' - distribution: 'temurin' - cache: 'sbt' - - - name: Setup sbt launcher - uses: sbt/setup-sbt@v1 - - name: Build and Test - run: sbt test - - name: Setup Docker - run: sbt clean compile docker:stage - - - name: Configure Docker - run: | - gcloud auth configure-docker ${{ env.AR_REPO_LOCATION }}-docker.pkg.dev - - - name: Build Docker image - run: | - docker build -t "${{ env.AR_URL }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}" -t "${{ env.AR_URL }}/${{ env.IMAGE_NAME }}:latest" -f server/target/docker/stage/Dockerfile server/target/docker/stage - - - name: Push Docker image - run: | - docker push "${{ env.AR_URL }}/${{ env.IMAGE_NAME }}" --all-tags \ No newline at end of file diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml deleted file mode 100644 index a1dc720..0000000 --- a/.github/workflows/merge-main.yml +++ /dev/null @@ -1,78 +0,0 @@ -name: Scala CI with SBT and Docker - -on: - push: - branches: [ 'main' ] -env: - IMAGE_NAME: 'address-index-server' - PROJECT_ID: 'ons-ci-aims' - AR_REPO_LOCATION: 'europe-west2' - AR_URL: 'europe-west2-docker.pkg.dev/ons-ci-aims/aims-api-repository' - WORKLOAD_IDENTITY_PROVIDER: 'projects/709138365636/locations/global/workloadIdentityPools/github-actions-aims-pool/providers/aims-api-provider' -permissions: - contents: write - id-token: write -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v5.0.0 - - - name: Google Auth - id: auth - uses: 'google-github-actions/auth@v3' - with: - project_id: ${{ env.PROJECT_ID }} - workload_identity_provider: ${{ env.WORKLOAD_IDENTITY_PROVIDER }} - - - name: Set up JDK 21 - uses: actions/setup-java@v5.0.0 - with: - java-version: '21' - distribution: 'temurin' - cache: 'sbt' - - - name: Set up JDK 21 - uses: actions/setup-java@v5.0.0 - with: - java-version: '21' - distribution: 'temurin' - cache: 'sbt' - - - name: Setup sbt launcher - uses: sbt/setup-sbt@v1 - - name: Build and Test - run: sbt test - - name: Setup Docker - run: sbt clean compile docker:stage - - - name: Read value from file - id: read_file - run: | - VALUE=$(cat version.txt) - echo "VALUE=$VALUE" >> $GITHUB_ENV - - - name: Configure Docker - run: | - gcloud auth configure-docker ${{ env.AR_REPO_LOCATION }}-docker.pkg.dev - - - name: Build Docker image - run: | - docker build -t "${{ env.AR_URL }}/${{ env.IMAGE_NAME }}:${{ env.VALUE }}" -t "${{ env.AR_URL }}/${{ env.IMAGE_NAME }}:latest" -f server/target/docker/stage/Dockerfile server/target/docker/stage - - - name: Push Docker image - run: | - docker push "${{ env.AR_URL }}/${{ env.IMAGE_NAME }}" --all-tags - - dependency-submission: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v5.0.0 - - - name: Setup sbt launcher - uses: sbt/setup-sbt@v1 - - - name: Upload dependency graph - uses: scalacenter/sbt-dependency-submission@v3.1.0 \ No newline at end of file diff --git a/.github/workflows/pull-request-main.yml b/.github/workflows/pull-request-main.yml index 2f4e4b7..446643f 100644 --- a/.github/workflows/pull-request-main.yml +++ b/.github/workflows/pull-request-main.yml @@ -13,17 +13,17 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v5.0.0 + uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v5.0.0 + uses: actions/setup-java@v5 with: java-version: '21' distribution: 'temurin' cache: 'sbt' - name: Set up JDK 21 - uses: actions/setup-java@v5.0.0 + uses: actions/setup-java@v5 with: java-version: '21' distribution: 'temurin' diff --git a/version.txt b/version.txt index 14d56a2..4da23fd 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.3.20 \ No newline at end of file +1.3.21 \ No newline at end of file From 73263d02dc8cf3b3aedcb138b0996929dacc8cc8 Mon Sep 17 00:00:00 2001 From: steve-thorne-ONS Date: Thu, 18 Jun 2026 15:14:49 +0100 Subject: [PATCH 2/2] Other version. --- server/version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/version.sbt b/server/version.sbt index 40c2c2e..667e792 100644 --- a/server/version.sbt +++ b/server/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.3.19" +ThisBuild / version := "1.3.21"