From 46f7ef43e87ef016f59659dc5b6c2ffb018c6e0b Mon Sep 17 00:00:00 2001 From: holzi1005 Date: Sat, 5 Sep 2026 14:25:17 +0200 Subject: [PATCH 1/6] update --- .github/workflows/task-release.yml | 22 ----------------- .github/workflows/task-version.yml | 39 ------------------------------ 2 files changed, 61 deletions(-) delete mode 100644 .github/workflows/task-release.yml delete mode 100644 .github/workflows/task-version.yml diff --git a/.github/workflows/task-release.yml b/.github/workflows/task-release.yml deleted file mode 100644 index a4ae7fa..0000000 --- a/.github/workflows/task-release.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Release Version - -on: - workflow_call: - inputs: - version: - description: 'release version' - default: true - type: string -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Create new Release with semantic-version tag - uses: ncipollo/release-action@v1 - with: - draft: false - prerelease: false - allowUpdates: true - name: Release ${{ inputs.version }} - tag: ${{ inputs.version }} - bodyFile: RELEASE_NOTE.md diff --git a/.github/workflows/task-version.yml b/.github/workflows/task-version.yml deleted file mode 100644 index 0b25dc9..0000000 --- a/.github/workflows/task-version.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Publish Docker image - -on: - workflow_call: - outputs: - version_output: - description: Output next build version - value: ${{ jobs.detect_version.outputs.version }} -jobs: - detect_version: - name: Generate new Release Version - runs-on: ubuntu-latest - outputs: - version: ${{ steps.version.outputs.version }} - steps: - - name: Check out the repo - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - uses: paulhatch/semantic-version@v5.0.2 - id: version - with: - tag_prefix: "" - major_pattern: "(MAJOR)" - minor_pattern: "(MINOR)" - change_path: . - version_format: "${major}.${minor}.${patch}" - - - name: Create new Release with semantic-version tag - uses: ncipollo/release-action@v1 - id: create_release - with: - draft: false - prerelease: false - allowUpdates: true - name: Release ${{ steps.version.outputs.version }} - tag: ${{ steps.version.outputs.version }} - bodyFile: RELEASE_NOTE.md From 8d1bbf1375b7133138268bb566bda9368cc2ba66 Mon Sep 17 00:00:00 2001 From: holzi1005 Date: Sat, 5 Sep 2026 14:26:32 +0200 Subject: [PATCH 2/6] update --- .github/workflows/release.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6807163..a617505 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,21 @@ on: jobs: version: - uses: ./.github/workflows/task-version.yml + steps: + - name version + id: version + uses: h2-invent/action-compute-tag@v2.2.0 + + - name: Create new Release with semantic-version tag + uses: ncipollo/release-action@v1 + id: create_release + with: + draft: false + prerelease: false + allowUpdates: true + name: Release ${{ steps.version.outputs.version }} + tag: ${{ steps.version.outputs.version }} + bodyFile: RELEASE_NOTE.md docker_image: needs: @@ -25,3 +39,4 @@ jobs: secrets: docker_password: ${{ secrets.HARBOR_PUSH_PASSWORD }} docker_username: ${{ secrets.HARBOR_PUSH_USERNAME }} + From 65d89f84f2fceebf8125fd8aa669bb7f93024990 Mon Sep 17 00:00:00 2001 From: holzi1005 Date: Sat, 5 Sep 2026 14:27:13 +0200 Subject: [PATCH 3/6] fix outputs --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a617505..e7394a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,8 @@ on: jobs: version: + outputs: + version: ${{ steps.version.outputs.version }} steps: - name version id: version @@ -34,8 +36,8 @@ jobs: registry: reg.h2-invent.com dockerfile_path: './Dockerfile' directory: '.' - version: ${{ needs.version.outputs.version_output }} - tags: reg.h2-invent.com/filemanager/core:${{ needs.version.outputs.version_output }},reg.h2-invent.com/filemanager/core:latest + version: ${{ needs.version.outputs.version }} + tags: reg.h2-invent.com/filemanager/core:${{ needs.version.outputs.version }},reg.h2-invent.com/filemanager/core:latest secrets: docker_password: ${{ secrets.HARBOR_PUSH_PASSWORD }} docker_username: ${{ secrets.HARBOR_PUSH_USERNAME }} From b89760c30c06708b313acdc25788506205031ff0 Mon Sep 17 00:00:00 2001 From: holzi1005 Date: Sat, 5 Sep 2026 14:28:25 +0200 Subject: [PATCH 4/6] update with --- .github/workflows/release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7394a2..501619e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,9 +13,14 @@ jobs: outputs: version: ${{ steps.version.outputs.version }} steps: - - name version + - name: Compute tag id: version uses: h2-invent/action-compute-tag@v2.2.0 + with: + event-name: ${{ github.event_name }} + base-ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.event.pull_request.base.ref }} + pr-action: ${{ github.event.action }} + pr-merged: ${{ github.event.pull_request.merged }} - name: Create new Release with semantic-version tag uses: ncipollo/release-action@v1 From 79dbfa58d2c280151e2dc87d3e799ae9fe7deb43 Mon Sep 17 00:00:00 2001 From: holzi1005 Date: Sat, 5 Sep 2026 14:29:27 +0200 Subject: [PATCH 5/6] update --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 501619e..564eede 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,9 +10,15 @@ on: jobs: version: + runs-on: ubuntu-latest outputs: version: ${{ steps.version.outputs.version }} steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Compute tag id: version uses: h2-invent/action-compute-tag@v2.2.0 From 1f78f6ddcf6a80c77f972856ee63904d1bf51a64 Mon Sep 17 00:00:00 2001 From: holzi1005 Date: Sat, 5 Sep 2026 14:30:38 +0200 Subject: [PATCH 6/6] add skip --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 564eede..88444bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,6 +43,7 @@ jobs: needs: - version uses: ./.github/workflows/task-docker.yml + if: needs.version.outputs.skip != 'true' with: registry: reg.h2-invent.com dockerfile_path: './Dockerfile'