From 72ad310b93af667afade4ed4a42f3cec318a19b4 Mon Sep 17 00:00:00 2001 From: JonasDevDE Date: Sat, 23 Aug 2025 22:36:19 +0200 Subject: [PATCH 1/3] fix: add shadowjar to cli module --- cli/build.gradle | 14 ++++++++++++++ .../com/interguess/devbox/cli/CliBootstrap.java | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 cli/src/main/java/com/interguess/devbox/cli/CliBootstrap.java diff --git a/cli/build.gradle b/cli/build.gradle index 0ce6a16..7ae135d 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -1,3 +1,17 @@ +plugins { + id 'com.github.johnrengelman.shadow' version '8.1.1' +} + dependencies { +} + +shadowJar { + archiveFileName = String.format('%s-%s-%s.jar', project(':').name, project.name, project(':').version) + + manifest { + attributes( + 'Main-Class': 'com.interguess.devbox.cli.CliBootstrap' + ) + } } \ No newline at end of file diff --git a/cli/src/main/java/com/interguess/devbox/cli/CliBootstrap.java b/cli/src/main/java/com/interguess/devbox/cli/CliBootstrap.java new file mode 100644 index 0000000..4c28074 --- /dev/null +++ b/cli/src/main/java/com/interguess/devbox/cli/CliBootstrap.java @@ -0,0 +1,8 @@ +package com.interguess.devbox.cli; + +public class CliBootstrap { + + public static void main(String[] args) { + + } +} From 4d3040e08a7225c330de53015a7299bf726a2f6b Mon Sep 17 00:00:00 2001 From: JonasDevDE Date: Sat, 23 Aug 2025 23:26:12 +0200 Subject: [PATCH 2/3] fix: move rollback state saving to top of workflow to be executes before other tasks fail --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 266c412..cd1efa3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,6 +43,13 @@ jobs: fetch-depth: 0 fetch-tags: true + - name: Save rollback state + uses: actions/upload-artifact@v4 + with: + name: release-state + path: state.env + if-no-files-found: error + - name: Init rollback state run: | echo "REPO=${{ github.repository }}" >> state.env @@ -211,13 +218,6 @@ jobs: - name: Record release tag for rollback run: echo "RELEASE_TAG=${{ env.NEW_VERSION }}" >> state.env - - name: Save rollback state - uses: actions/upload-artifact@v4 - with: - name: release-state - path: state.env - if-no-files-found: error - - name: Build and push image uses: docker/build-push-action@v6 with: @@ -321,4 +321,4 @@ jobs: --base "${BASE_BRANCH}" \ --head "revert/${HEAD_SHA}" \ --title "Revert: ${HEAD_SHA} (auto-rollback)" \ - --body "Automatisches Rollback, da der Release-Workflow fehlgeschlagen ist." || true + --body "Rollback." || true From 776e9b706af2926f461e478b32ed9e881a83f0c9 Mon Sep 17 00:00:00 2001 From: JonasDevDE <73913242+JonasDevDE@users.noreply.github.com> Date: Sat, 23 Aug 2025 23:29:46 +0200 Subject: [PATCH 3/3] chore: apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: JonasDevDE <73913242+JonasDevDE@users.noreply.github.com> --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd1efa3..4a88322 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,13 +43,6 @@ jobs: fetch-depth: 0 fetch-tags: true - - name: Save rollback state - uses: actions/upload-artifact@v4 - with: - name: release-state - path: state.env - if-no-files-found: error - - name: Init rollback state run: | echo "REPO=${{ github.repository }}" >> state.env