From c9691e69cfe9fe6279966940c553c6779af2a8c1 Mon Sep 17 00:00:00 2001 From: Wikum Weerakutti Date: Thu, 4 Jun 2026 18:25:29 +0530 Subject: [PATCH 1/9] Migrate to the reusable GHA. --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ .github/workflows/main.yml | 32 -------------------------------- .github/workflows/release.yml | 31 +++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/main.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..aa07604 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,22 @@ +name: Build + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: + +jobs: + build: + uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-backend-module.yml@main + secrets: + MAVEN_REPO_USERNAME: ${{ secrets.MAVEN_REPO_USERNAME }} + MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }} + + owasp-dependency-check: + if: ${{ github.event_name != 'pull_request' }} + uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/owasp-dependency-check.yml@main + secrets: + NVD_API_KEY: ${{ secrets.NVD_API_KEY }} + BOT_GH_TOKEN: ${{ secrets.OMRS_BOT_GH_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index ad2dd4e..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Build with Maven - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - workflow_dispatch: - -jobs: - build: - strategy: - matrix: - platform: [ ubuntu-latest ] - java-version: [ 8 ] - - runs-on: ${{ matrix.platform }} - env: - PLATFORM: ${{ matrix.platform }} - JAVA_VERSION: ${{ matrix.java-version }} - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: ${{ matrix.java-version }} - - name: Build with Maven - id: build_with_maven - run: | - mvn clean verify --batch-mode --file pom.xml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..497fc0d --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,31 @@ +name: Release + +on: + workflow_dispatch: + inputs: + release_version: + description: 'Release version (e.g., 1.3.3)' + required: true + development_version: + description: 'Next development version (e.g., 1.4.0-SNAPSHOT)' + required: true + branch: + description: 'Branch to release from (e.g., master)' + required: false + default: 'master' + +jobs: + release: + uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/release-backend-module.yml@main + permissions: + contents: write + with: + release_version: ${{ inputs.release_version }} + development_version: ${{ inputs.development_version }} + branch: ${{ inputs.branch }} + secrets: + MAVEN_REPO_USERNAME: ${{ secrets.MAVEN_REPO_USERNAME }} + MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }} + BOT_PAT: ${{ secrets.OMRS_BOT_GH_TOKEN }} + GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} \ No newline at end of file From 754e171bcf771bf86fe3793a0e765a8e626a5ac3 Mon Sep 17 00:00:00 2001 From: Wikum Weerakutti Date: Thu, 4 Jun 2026 18:44:08 +0530 Subject: [PATCH 2/9] Specify Java versions for reusable GHA workflow. --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa07604..00cc143 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,8 @@ on: jobs: build: uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-backend-module.yml@main + with: + java_versions: '[8, 11, 17, 21, 25]' secrets: MAVEN_REPO_USERNAME: ${{ secrets.MAVEN_REPO_USERNAME }} MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }} From fa90a6b575374eda0cca018493de00bb04f0bdaf Mon Sep 17 00:00:00 2001 From: Wikum Weerakutti Date: Thu, 4 Jun 2026 18:51:12 +0530 Subject: [PATCH 3/9] Update default release branch in workflow to 'main' --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 497fc0d..3ff75ac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,9 +10,9 @@ on: description: 'Next development version (e.g., 1.4.0-SNAPSHOT)' required: true branch: - description: 'Branch to release from (e.g., master)' + description: 'Branch to release from (e.g., main)' required: false - default: 'master' + default: 'main' jobs: release: From 2bb7aae599ae43d50a31b65f74de5e29fe7dbafe Mon Sep 17 00:00:00 2001 From: Wikum Weerakutti Date: Thu, 4 Jun 2026 18:53:32 +0530 Subject: [PATCH 4/9] Replace reusable GHA workflow with custom Maven build configuration. --- .github/workflows/build.yml | 24 --------------------- .github/workflows/main.yml | 40 +++++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 2 +- 3 files changed, 41 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 00cc143..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - workflow_dispatch: - -jobs: - build: - uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-backend-module.yml@main - with: - java_versions: '[8, 11, 17, 21, 25]' - secrets: - MAVEN_REPO_USERNAME: ${{ secrets.MAVEN_REPO_USERNAME }} - MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }} - - owasp-dependency-check: - if: ${{ github.event_name != 'pull_request' }} - uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/owasp-dependency-check.yml@main - secrets: - NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - BOT_GH_TOKEN: ${{ secrets.OMRS_BOT_GH_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..3c7edf1 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,40 @@ +name: Build with Maven + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: + +jobs: + build: + strategy: + matrix: + platform: [ ubuntu-latest ] + java-version: [ 8 ] + + runs-on: ${{ matrix.platform }} + env: + PLATFORM: ${{ matrix.platform }} + JAVA_VERSION: ${{ matrix.java-version }} + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: ${{ matrix.java-version }} + - name: Build with Maven + id: build_with_maven + run: | + mvn clean verify --batch-mode --file pom.xml + + owasp-dependency-check: + if: ${{ github.event_name != 'pull_request' }} + uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/owasp-dependency-check.yml@main + secrets: + NVD_API_KEY: ${{ secrets.NVD_API_KEY }} + BOT_GH_TOKEN: ${{ secrets.OMRS_BOT_GH_TOKEN }} + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ff75ac..bdfc970 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,4 +28,4 @@ jobs: MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }} BOT_PAT: ${{ secrets.OMRS_BOT_GH_TOKEN }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} \ No newline at end of file + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} From 29f3703b4d806274f22110505276afc4a67e396f Mon Sep 17 00:00:00 2001 From: Wikum Weerakutti Date: Tue, 23 Jun 2026 11:37:50 +0530 Subject: [PATCH 5/9] Replace reusable GHA workflow with custom Maven build configuration. --- .github/workflows/main.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c7edf1..c0ab342 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,10 +31,3 @@ jobs: run: | mvn clean verify --batch-mode --file pom.xml - owasp-dependency-check: - if: ${{ github.event_name != 'pull_request' }} - uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/owasp-dependency-check.yml@main - secrets: - NVD_API_KEY: ${{ secrets.NVD_API_KEY }} - BOT_GH_TOKEN: ${{ secrets.OMRS_BOT_GH_TOKEN }} - From 871d5c664e43e1892772c37d3547d646eab817c9 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 8 Jul 2026 09:27:10 -0400 Subject: [PATCH 6/9] Also use shared build-maven workflow --- .github/workflows/main.yml | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c0ab342..4758870 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,27 +7,13 @@ on: branches: [ main ] workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: build: - strategy: - matrix: - platform: [ ubuntu-latest ] - java-version: [ 8 ] - - runs-on: ${{ matrix.platform }} - env: - PLATFORM: ${{ matrix.platform }} - JAVA_VERSION: ${{ matrix.java-version }} - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: ${{ matrix.java-version }} - - name: Build with Maven - id: build_with_maven - run: | - mvn clean verify --batch-mode --file pom.xml - + uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-maven.yml@main + secrets: + MAVEN_REPO_USERNAME: ${{ secrets.MAVEN_REPO_USERNAME }} + MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }} From eb0170c2c2aa59109f2c792b6faac0379c8793f3 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 8 Jul 2026 09:29:52 -0400 Subject: [PATCH 7/9] Set default Java version --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4758870..fd8f9be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,8 @@ concurrency: jobs: build: uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-maven.yml@main + with: + java_versions: "[8]" secrets: MAVEN_REPO_USERNAME: ${{ secrets.MAVEN_REPO_USERNAME }} MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }} From 8d610389e77dc3eb0b9afd13e172d3f7abead063 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 8 Jul 2026 09:31:05 -0400 Subject: [PATCH 8/9] And main version --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd8f9be..b8e300c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,7 @@ jobs: uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-maven.yml@main with: java_versions: "[8]" + main_java_version: 8 secrets: MAVEN_REPO_USERNAME: ${{ secrets.MAVEN_REPO_USERNAME }} MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }} From 6809b0979e18502693eb6cd26b5906657ca3bb84 Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 8 Jul 2026 09:32:12 -0400 Subject: [PATCH 9/9] Simplify java_versions --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8e300c..3ff18cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,8 +15,7 @@ jobs: build: uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-maven.yml@main with: - java_versions: "[8]" - main_java_version: 8 + java_versions: 8 secrets: MAVEN_REPO_USERNAME: ${{ secrets.MAVEN_REPO_USERNAME }} MAVEN_REPO_API_KEY: ${{ secrets.MAVEN_REPO_API_KEY }}