From a31def73f8c4bbc09dd8c171151b089ea82420f2 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 22:48:30 +0300 Subject: [PATCH 01/20] remove old unused release pipeline --- .github/workflows/release.yml | 43 ----------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index a1186ce30..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,43 +0,0 @@ -# adopted from https://github.com/PrismLauncher/PrismLauncher -name: Release - -on: - push: - tags: - - "v*" - -jobs: - build_release: - name: Build Release - uses: ./.github/workflows/cmake.yml - with: - build_type: Release - upload_artifacts: true - - create_release: - needs: build_release - runs-on: ubuntu-latest - steps: - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - name: VoxelEngine - - name: Pack artifacts - run: | - chmod +x VoxelEngine - zip -r VoxelEngine.zip res VoxelEngine - - name: Grab and store version - run: | - tag_name=$(echo ${{ github.ref }} | grep -oE "v[^/]+$") - echo "VERSION=$tag_name" >> $GITHUB_ENV - - - name: Create release - uses: softprops/action-gh-release@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag_name: ${{ github.ref }} - name: VoxelEngine ${{ env.VERSION }} - draft: true - prerelease: false - files: | - VoxelEngine.zip From d7221e46bc115938dd788f38dafc59552f84bd70 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:11:15 +0300 Subject: [PATCH 02/20] add release workflow --- .github/workflows/appimage.yml | 1 + .github/workflows/macos.yml | 1 + .github/workflows/release.yml | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 121c5a603..9fd508b99 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -5,6 +5,7 @@ on: branches: [ "main", "release-**"] pull_request: branches: [ "main", "dev" ] + workflow_call: jobs: build-appimage: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index bb40a7ad2..75622c426 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,6 +5,7 @@ on: branches: [ "main", "release-**"] pull_request: branches: [ "main", "dev" ] + workflow_call: jobs: build-dmg: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..1994cd2e2 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,24 @@ +name: Release +on: + workflow_dispatch: + inputs: + version: + description: 'Engine release version' + required: true + default: "0.0.0" +jobs: + build_linux: + runs-on: ubuntu-latest + steps: + - name: Build AppImage + uses: ./.github/workflows/appimage.yml + build_macos: + runs-on: ubuntu-latest + steps: + - name: Build DMG + uses: ./.github/workflows/macos.yml + build_windows: + runs-on: ubuntu-latest + steps: + - name: Build Exe + uses: ./.github/workflows/windows.yml From 074072b7393df9af79cf5db18bbff41d8737c178 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:14:53 +0300 Subject: [PATCH 03/20] update release.yml --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1994cd2e2..26fc16c22 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,8 @@ on: description: 'Engine release version' required: true default: "0.0.0" + pull_request: + branches: ["main"] jobs: build_linux: runs-on: ubuntu-latest From f1bfcb88800e89c00b8be6e5745314ab130b940c Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:18:57 +0300 Subject: [PATCH 04/20] update release.yml --- .github/workflows/release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 26fc16c22..8788acf32 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,15 +12,21 @@ jobs: build_linux: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Build AppImage uses: ./.github/workflows/appimage.yml build_macos: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Build DMG uses: ./.github/workflows/macos.yml build_windows: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Build Exe uses: ./.github/workflows/windows.yml From 28dbf6ec4cb3352d5c40db22bb92d86c22d2b17c Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:28:42 +0300 Subject: [PATCH 05/20] update release.yml --- .github/workflows/release.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8788acf32..f329bea76 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,23 +10,8 @@ on: branches: ["main"] jobs: build_linux: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Build AppImage - uses: ./.github/workflows/appimage.yml + uses: ./.github/workflows/appimage.yml build_macos: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Build DMG - uses: ./.github/workflows/macos.yml + uses: ./.github/workflows/macos.yml build_windows: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Build Exe - uses: ./.github/workflows/windows.yml + uses: ./.github/workflows/windows.yml From 9130997796fc8c38fe6ffc63903c9d9c50a1e91e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:34:50 +0300 Subject: [PATCH 06/20] add publish_release job --- .github/workflows/release.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f329bea76..ca44563b7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,3 +15,15 @@ jobs: uses: ./.github/workflows/macos.yml build_windows: uses: ./.github/workflows/windows.yml + publish_release: + runs-on: ubuntu-latest + needs: [build_linux, build_macos, build_windows] + steps: + - name: Download Build Artifact + uses: actions/download-artifact@v4 + with: + path: ./artifacts + - name: Show Artifacts + run: | + ls ./artifacts + From 90597679223256705df774fa86c6d05db2b30800 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:36:41 +0300 Subject: [PATCH 07/20] update windows.yml --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index afeed7572..496996bea 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -5,6 +5,7 @@ on: branches: [ "main", "release-**"] pull_request: branches: [ "main", "dev" ] + workflow_call: jobs: build-windows: From b489248e6ebf88348b2a16b0017d62db0c726ea3 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:41:44 +0300 Subject: [PATCH 08/20] temporary disable workflows --- .github/workflows/appimage.yml | 4 ++-- .github/workflows/macos.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 9fd508b99..2b65ed192 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -3,8 +3,8 @@ name: x86-64 AppImage on: push: branches: [ "main", "release-**"] - pull_request: - branches: [ "main", "dev" ] +# pull_request: +# branches: [ "main", "dev" ] workflow_call: jobs: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 75622c426..4dcca9e67 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,8 +3,8 @@ name: Macos Build on: push: branches: [ "main", "release-**"] - pull_request: - branches: [ "main", "dev" ] +# pull_request: +# branches: [ "main", "dev" ] workflow_call: jobs: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 496996bea..76d32f776 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,8 +3,8 @@ name: MSVC Build on: push: branches: [ "main", "release-**"] - pull_request: - branches: [ "main", "dev" ] +# pull_request: +# branches: [ "main", "dev" ] workflow_call: jobs: From de2defa89350492943d1b92bc8289d19a1a1bdc8 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:51:47 +0300 Subject: [PATCH 09/20] update release.yml --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ca44563b7..442c2a2f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,5 +25,6 @@ jobs: path: ./artifacts - name: Show Artifacts run: | - ls ./artifacts + sudo apt install -y tree + tree ./artifacts From 93ffcaac9d1545db239333394d7784498f038800 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 3 Dec 2025 23:52:39 +0300 Subject: [PATCH 10/20] temporary disable windows-clang.yml pull_request trigger --- .github/workflows/windows-clang.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml index cb4864096..0f01cf3f5 100644 --- a/.github/workflows/windows-clang.yml +++ b/.github/workflows/windows-clang.yml @@ -3,8 +3,8 @@ name: Windows Build (CLang) on: push: branches: [ "main", "release-**"] - pull_request: - branches: [ "main", "dev" ] +# pull_request: +# branches: [ "main", "dev" ] jobs: build-windows: From 3d21a20265a9fa0c5a465b68474076690032256b Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 00:54:03 +0300 Subject: [PATCH 11/20] add more steps --- .github/workflows/release.yml | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 442c2a2f1..7ee3cc6d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,8 +6,15 @@ on: description: 'Engine release version' required: true default: "0.0.0" + branch: + description: 'Release branch name' + required: true + default: "release-0.0" pull_request: branches: ["main"] +env: + RELEASE_VERSION: ${{ github.event.inputs.version || 'testrelease' }} + BRANCH_NAME: ${{ github.event.inputs.branch || 'main' }} jobs: build_linux: uses: ./.github/workflows/appimage.yml @@ -25,6 +32,27 @@ jobs: path: ./artifacts - name: Show Artifacts run: | - sudo apt install -y tree - tree ./artifacts + mkdir release + mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \ + ./release/voxelcore-${RELEASE_VERSION}_x86-64.AppImage + mv ./artifacts/VoxelEngineMacOs/VoxelEngineMacApp.dmg \ + ./release/voxelcore-${RELEASE_VERSION}_macos.dmg + zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/* + ls -la ./release + tree ./release + - name: Create Tag + run: | + TAG_NAME="v${RELEASE_VERSION}" + + git switch $BRANCH_NAME + git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}" + git push origin "${TAG_NAME}" + - name: Create Release Draft + uses: softprops/action-gh-release@v2 + with: + tag_name: v${{ env.RELEASE_VERSION }} + draft: true + files: ./release/* + body: | + Auto-generated From f41d4b4a666cc9095eb8363f46bc4db221d7c56e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 01:17:32 +0300 Subject: [PATCH 12/20] update release.yml --- .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 7ee3cc6d3..a74b483db 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,11 +40,13 @@ jobs: zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/* ls -la ./release tree ./release + - name: Checkout Release Branch + uses: actions/checkout@v4 + with: + ref: ${{ env.BRANCH_NAME }} - name: Create Tag run: | TAG_NAME="v${RELEASE_VERSION}" - - git switch $BRANCH_NAME git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}" git push origin "${TAG_NAME}" - name: Create Release Draft From 292e7682421bb8f961e29f9d2e4113e80aa4d9b4 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 01:36:38 +0300 Subject: [PATCH 13/20] update release.yml --- .github/workflows/release.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a74b483db..4eff6428a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,15 +16,15 @@ env: RELEASE_VERSION: ${{ github.event.inputs.version || 'testrelease' }} BRANCH_NAME: ${{ github.event.inputs.branch || 'main' }} jobs: - build_linux: - uses: ./.github/workflows/appimage.yml - build_macos: - uses: ./.github/workflows/macos.yml - build_windows: - uses: ./.github/workflows/windows.yml + # build_linux: + # uses: ./.github/workflows/appimage.yml + # build_macos: + # uses: ./.github/workflows/macos.yml + # build_windows: + # uses: ./.github/workflows/windows.yml publish_release: runs-on: ubuntu-latest - needs: [build_linux, build_macos, build_windows] + needs: [build_macos] steps: - name: Download Build Artifact uses: actions/download-artifact@v4 @@ -33,11 +33,11 @@ jobs: - name: Show Artifacts run: | mkdir release - mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \ - ./release/voxelcore-${RELEASE_VERSION}_x86-64.AppImage + # mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \ + # ./release/voxelcore-${RELEASE_VERSION}_x86-64.AppImage mv ./artifacts/VoxelEngineMacOs/VoxelEngineMacApp.dmg \ ./release/voxelcore-${RELEASE_VERSION}_macos.dmg - zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/* + # zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/* ls -la ./release tree ./release - name: Checkout Release Branch @@ -46,15 +46,19 @@ jobs: ref: ${{ env.BRANCH_NAME }} - name: Create Tag run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + TAG_NAME="v${RELEASE_VERSION}" git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}" git push origin "${TAG_NAME}" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create Release Draft uses: softprops/action-gh-release@v2 with: tag_name: v${{ env.RELEASE_VERSION }} draft: true files: ./release/* - body: | - Auto-generated + generate_release_notes: true From fa2d31795780b67b9305646617000e6b7d083bac Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 01:37:17 +0300 Subject: [PATCH 14/20] fix --- .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 4eff6428a..db72e827c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,8 +18,8 @@ env: jobs: # build_linux: # uses: ./.github/workflows/appimage.yml - # build_macos: - # uses: ./.github/workflows/macos.yml + build_macos: + uses: ./.github/workflows/macos.yml # build_windows: # uses: ./.github/workflows/windows.yml publish_release: From 73976a5169888fe70fe72c82e82295f1c248096f Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 01:44:30 +0300 Subject: [PATCH 15/20] fix --- .github/workflows/release.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db72e827c..ade219f4f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,6 +26,10 @@ jobs: runs-on: ubuntu-latest needs: [build_macos] steps: + - name: Checkout Release Branch + uses: actions/checkout@v4 + with: + ref: ${{ env.BRANCH_NAME }} - name: Download Build Artifact uses: actions/download-artifact@v4 with: @@ -40,10 +44,6 @@ jobs: # zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/* ls -la ./release tree ./release - - name: Checkout Release Branch - uses: actions/checkout@v4 - with: - ref: ${{ env.BRANCH_NAME }} - name: Create Tag run: | git config --local user.email "action@github.com" @@ -59,6 +59,7 @@ jobs: with: tag_name: v${{ env.RELEASE_VERSION }} draft: true - files: ./release/* + files: | + ./release/* generate_release_notes: true From 9c982647cdb8d2b0cc8d2859f24cb0e7945c6881 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 01:51:43 +0300 Subject: [PATCH 16/20] restore jobs --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ade219f4f..60fccd009 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,15 +16,15 @@ env: RELEASE_VERSION: ${{ github.event.inputs.version || 'testrelease' }} BRANCH_NAME: ${{ github.event.inputs.branch || 'main' }} jobs: - # build_linux: - # uses: ./.github/workflows/appimage.yml + build_linux: + uses: ./.github/workflows/appimage.yml build_macos: uses: ./.github/workflows/macos.yml - # build_windows: - # uses: ./.github/workflows/windows.yml + build_windows: + uses: ./.github/workflows/windows-clang.yml publish_release: runs-on: ubuntu-latest - needs: [build_macos] + needs: [build_linux, build_macos, build-windows] steps: - name: Checkout Release Branch uses: actions/checkout@v4 @@ -37,11 +37,11 @@ jobs: - name: Show Artifacts run: | mkdir release - # mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \ - # ./release/voxelcore-${RELEASE_VERSION}_x86-64.AppImage + mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \ + ./release/voxelcore-${RELEASE_VERSION}_x86-64.AppImage mv ./artifacts/VoxelEngineMacOs/VoxelEngineMacApp.dmg \ ./release/voxelcore-${RELEASE_VERSION}_macos.dmg - # zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/* + zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/* ls -la ./release tree ./release - name: Create Tag From 5405cd45f0b5f75643d212b04999f64afbf38d29 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 01:52:41 +0300 Subject: [PATCH 17/20] fix --- .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 60fccd009..4ec0ed4a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: uses: ./.github/workflows/windows-clang.yml publish_release: runs-on: ubuntu-latest - needs: [build_linux, build_macos, build-windows] + needs: [build_linux, build_macos, build_windows] steps: - name: Checkout Release Branch uses: actions/checkout@v4 From 2e2f7bb167fd54524a476c0d435a365d17608298 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 01:54:40 +0300 Subject: [PATCH 18/20] make windows-clang.yml reusable --- .github/workflows/windows-clang.yml | 1 + .github/workflows/windows.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml index 0f01cf3f5..60f1b36e7 100644 --- a/.github/workflows/windows-clang.yml +++ b/.github/workflows/windows-clang.yml @@ -5,6 +5,7 @@ on: branches: [ "main", "release-**"] # pull_request: # branches: [ "main", "dev" ] + workflow_call: jobs: build-windows: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 76d32f776..03e413ffe 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -5,7 +5,6 @@ on: branches: [ "main", "release-**"] # pull_request: # branches: [ "main", "dev" ] - workflow_call: jobs: build-windows: From ef39ca0bb4e05f213b205e62e78b116ce36b257f Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 02:17:48 +0300 Subject: [PATCH 19/20] fix --- .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 4ec0ed4a2..479d2b5d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: ./release/voxelcore-${RELEASE_VERSION}_x86-64.AppImage mv ./artifacts/VoxelEngineMacOs/VoxelEngineMacApp.dmg \ ./release/voxelcore-${RELEASE_VERSION}_macos.dmg - zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/* + (cd ./artifacts/Windows-Build && zip -r ../../release/voxelcore-${RELEASE_VERSION}_win64.zip .) ls -la ./release tree ./release - name: Create Tag From 59cdd2aa4773dba46f854a75e858ec9e39bd4859 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Thu, 4 Dec 2025 07:45:41 +0300 Subject: [PATCH 20/20] cleanup --- .github/workflows/appimage.yml | 4 ++-- .github/workflows/macos.yml | 4 ++-- .github/workflows/release.yml | 2 -- .github/workflows/windows-clang.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 2b65ed192..9fd508b99 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -3,8 +3,8 @@ name: x86-64 AppImage on: push: branches: [ "main", "release-**"] -# pull_request: -# branches: [ "main", "dev" ] + pull_request: + branches: [ "main", "dev" ] workflow_call: jobs: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4dcca9e67..75622c426 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,8 +3,8 @@ name: Macos Build on: push: branches: [ "main", "release-**"] -# pull_request: -# branches: [ "main", "dev" ] + pull_request: + branches: [ "main", "dev" ] workflow_call: jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 479d2b5d6..36fd0e789 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,8 +10,6 @@ on: description: 'Release branch name' required: true default: "release-0.0" - pull_request: - branches: ["main"] env: RELEASE_VERSION: ${{ github.event.inputs.version || 'testrelease' }} BRANCH_NAME: ${{ github.event.inputs.branch || 'main' }} diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml index 60f1b36e7..40ebca9dc 100644 --- a/.github/workflows/windows-clang.yml +++ b/.github/workflows/windows-clang.yml @@ -3,8 +3,8 @@ name: Windows Build (CLang) on: push: branches: [ "main", "release-**"] -# pull_request: -# branches: [ "main", "dev" ] + pull_request: + branches: [ "main", "dev" ] workflow_call: jobs: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 03e413ffe..afeed7572 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,8 +3,8 @@ name: MSVC Build on: push: branches: [ "main", "release-**"] -# pull_request: -# branches: [ "main", "dev" ] + pull_request: + branches: [ "main", "dev" ] jobs: build-windows: