From 5eea72dd6610e50e5c8748b9109a247ceae01320 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 1 Apr 2025 08:22:28 +0300 Subject: [PATCH 1/7] chore(DVIZ-24): fix github actions --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db0f1b76..6bff28d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,7 +73,7 @@ jobs: dry_run: 'true' build-and-push-docker-image: - needs: release-and-tag + needs: prepare-a-release runs-on: ubuntu-latest steps: - name: Checkout Repository From 5bc18adcb7f7c2c4593b41337645e7a991dbad42 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 1 Apr 2025 08:32:21 +0300 Subject: [PATCH 2/7] chore(DVIZ-24): fix github actions tag generations --- .github/workflows/release.yml | 1 + cliff.toml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6bff28d8..537d45ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,6 +71,7 @@ jobs: release_branches: 'master,main,release/*' tag_prefix: 'v' dry_run: 'true' + custom_tag: '1.0.0' build-and-push-docker-image: needs: prepare-a-release diff --git a/cliff.toml b/cliff.toml index 1161ff27..de53f3bc 100644 --- a/cliff.toml +++ b/cliff.toml @@ -83,4 +83,7 @@ filter_commits = false # sort the tags topologically topo_order = false # sort the commits inside sections by oldest/newest order -sort_commits = "newest" \ No newline at end of file +sort_commits = "newest" + +[bump] +initial_tag = "v1.0.0" \ No newline at end of file From 0f3d37ca52e0eab5f7b853d56f73839e2f612494 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 1 Apr 2025 08:44:28 +0300 Subject: [PATCH 3/7] chore(DVIZ-24): fix tagging for the workflow --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 537d45ec..ad7d0293 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -104,21 +104,21 @@ jobs: context: . push: true build-args: | - VERSION=${{ needs.release-and-tag.outputs.new_version }} - TAG=${{ needs.release-and-tag.outputs.new_version }} + VERSION=${{ needs.prepare-a-release.outputs.new_version }} + TAG=${{ needs.prepare-a-release.outputs.new_tag }} tags: | ${{ vars.DOCKER_REGISTRY }}/data-viz-admin:latest - ${{ vars.DOCKER_REGISTRY }}/data-viz-admin:v${{ needs.release-and-tag.outputs.new_version }} + ${{ vars.DOCKER_REGISTRY }}/data-viz-admin:v${{ needs.prepare-a-release.outputs.new_version }} release-on-github: - needs: build-and-push-docker-image + needs: prepare-a-release runs-on: ubuntu-latest steps: - name: Create Release id: create_release uses: softprops/action-gh-release@v2 with: - tag_name: ${{ needs.release-and-tag.outputs.new_tag }} + tag_name: ${{ needs.prepare-a-release.outputs.new_tag }} files: forms/target/deps/*.jar body_path: CHANGELOG.md draft: false From 754792b1f7ba83b44744e9038048072b9416f5f5 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 1 Apr 2025 08:51:27 +0300 Subject: [PATCH 4/7] chore(DVIZ-24): fix workflow job order --- .github/workflows/release.yml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ad7d0293..6abb59d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,16 +53,6 @@ jobs: && cd forms/target/deps \ && jar -xf ../*.jar - - name: Generate a changelog - uses: orhun/git-cliff-action@v3 - id: changelog - with: - config: cliff.toml - env: - OUTPUT: CHANGELOG.md - GITHUB_REPO: ${{ github.repository }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Generate Tag id: tag_version uses: mathieudutour/github-tag-action@v6.2 @@ -76,6 +66,9 @@ jobs: build-and-push-docker-image: needs: prepare-a-release runs-on: ubuntu-latest + outputs: + new_version: ${{ needs.prepare-a-release.outputs.new_version }} + new_tag: ${{ needs.prepare-a-release.outputs.new_tag }} steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -111,15 +104,25 @@ jobs: ${{ vars.DOCKER_REGISTRY }}/data-viz-admin:v${{ needs.prepare-a-release.outputs.new_version }} release-on-github: - needs: prepare-a-release + needs: build-and-push-docker-image runs-on: ubuntu-latest steps: + - name: Generate a changelog + uses: orhun/git-cliff-action@v3 + id: changelog + with: + config: cliff.toml + env: + OUTPUT: CHANGELOG.md + GITHUB_REPO: ${{ github.repository }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create Release id: create_release uses: softprops/action-gh-release@v2 with: - tag_name: ${{ needs.prepare-a-release.outputs.new_tag }} - files: forms/target/deps/*.jar + tag_name: ${{ needs.build-and-push-docker-image.outputs.new_tag }} + files: forms/target/*.jar body_path: CHANGELOG.md draft: false prerelease: false From 4529c7a0856b15453edf798dbaa6ba3c2a9bb820 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 1 Apr 2025 09:05:02 +0300 Subject: [PATCH 5/7] chore(DVIZ-24): fix build workflow order --- .github/workflows/release.yml | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6abb59d6..7ac5b71b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,35 +24,11 @@ jobs: with: fetch-depth: '0' - - name: Set up JDK - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'corretto' - cache: 'maven' - - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: | - ~/.m2/repository - !~/.m2/repository/org/devgateway/tcdi - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Configure Git user run: | git config user.email "tmugo@developmentgateway.org" git config user.name "Timothy Mugo Gachengo" - - name: Build the Maven project - run: | - mvn package -DskipTests=true -Dcheckstyle.skip \ - && mkdir -p forms/target/deps \ - && cd forms/target/deps \ - && jar -xf ../*.jar - - name: Generate Tag id: tag_version uses: mathieudutour/github-tag-action@v6.2 @@ -107,6 +83,30 @@ jobs: needs: build-and-push-docker-image runs-on: ubuntu-latest steps: + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'corretto' + cache: 'maven' + + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: | + ~/.m2/repository + !~/.m2/repository/org/devgateway/tcdi + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Build the Maven project + run: | + mvn package -DskipTests=true -Dcheckstyle.skip \ + && mkdir -p forms/target/deps \ + && cd forms/target/deps \ + && jar -xf ../*.jar + - name: Generate a changelog uses: orhun/git-cliff-action@v3 id: changelog From bb16002b16418aacdd4efd432867806697621171 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 1 Apr 2025 10:42:27 +0300 Subject: [PATCH 6/7] chore(DVIZ-24): add checkout to release stage --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ac5b71b..f70db866 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,6 +83,11 @@ jobs: needs: build-and-push-docker-image runs-on: ubuntu-latest steps: + - name: Checkout Repository + uses: actions/checkout@v4 + with: + fetch-depth: '0' + - name: Set up JDK uses: actions/setup-java@v4 with: From 11aee09845e8b6ee22e0d9359f13c02d85506a95 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 1 Apr 2025 10:55:37 +0300 Subject: [PATCH 7/7] chore(DVIZ-24): remove custom tag --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f70db866..6a0e7184 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,6 @@ jobs: release_branches: 'master,main,release/*' tag_prefix: 'v' dry_run: 'true' - custom_tag: '1.0.0' build-and-push-docker-image: needs: prepare-a-release