From 1ea15a961bc2d213546b6e263e873539838bde5d Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 01:32:11 +0500 Subject: [PATCH 01/10] Update build.yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 228405b6d..44cd69b5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: project_full_name: ${{ steps.pakku_info.outputs.name }}-${{ steps.check.outputs.version }} changelog: ${{ steps.changelog.outputs.description }} diff: ${{ steps.read_diff.outputs.diff }} - release_exists: ${{ steps.check_tag.outputs.exists == 'true' && env.DEV_ENVIRONMENT == 'false' }} + release_exists: ${{ steps.check_tag.outputs.exists && github.env.DEV_ENVIRONMENT }} steps: - name: Checkout @@ -348,7 +348,7 @@ jobs: name: 🚀 Release to GitHub needs: [info, build-modpack, build-server, build-multimc] runs-on: ubuntu-latest - if: needs.info.outputs.release_exists == 'false' + if: ${{ needs.info.outputs.release_exists == 'false'}} outputs: url: ${{ steps.release.outputs.url }} @@ -417,7 +417,7 @@ jobs: name: 🚀 Release to CurseForge needs: [info, build-modpack, build-server, release-github] runs-on: ubuntu-latest - if: needs.info.outputs.release_exists == 'false' + if: ${{ needs.info.outputs.release_exists == 'false'}} outputs: id: ${{ steps.release.outputs.id }} From dc8adedfaf684da0f722e4fe11d428aedc9a79bc Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 01:34:11 +0500 Subject: [PATCH 02/10] test --- CHANGELOG.md | 2 +- pakku.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0535a771f..5f3ce408e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [Unreleased] +## [0.9.2] ### Changes ## [0.9.1] - 18.04.2025 diff --git a/pakku.json b/pakku.json index 796b3396b..681652810 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.1", + "version": "0.9.2", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [ From 6b8cfb63f944d5642173ba64c16fd8678e34af59 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 01:42:27 +0500 Subject: [PATCH 03/10] Update build.yml --- .github/workflows/build.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44cd69b5a..14542017d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: project_full_name: ${{ steps.pakku_info.outputs.name }}-${{ steps.check.outputs.version }} changelog: ${{ steps.changelog.outputs.description }} diff: ${{ steps.read_diff.outputs.diff }} + exists: ${{ steps.check_tag.outputs.exists }} release_exists: ${{ steps.check_tag.outputs.exists && github.env.DEV_ENVIRONMENT }} steps: @@ -205,6 +206,19 @@ jobs: - name: Checkout uses: actions/checkout@v4.2.2 + - name: Debug + shell: bash + run: | + echo "Debugging..." + echo "Project Version: ${{ needs.info.outputs.project_version }}" + echo "Project Name: ${{ needs.info.outputs.project_name }}" + echo "Project Full Name: ${{ needs.info.outputs.project_full_name }}" + echo "Changelog: ${{ needs.info.outputs.changelog }}" + echo "Diff: ${{ needs.info.outputs.diff }}" + echo "Exists: ${{ needs.info.outputs.exists }}" + echo "Release Exists: ${{ needs.info.outputs.release_exists }}" + echo "Dev Environment: ${{ env.DEV_ENVIRONMENT }}" + - name: 🔄 Replace strings shell: bash run: | @@ -348,7 +362,7 @@ jobs: name: 🚀 Release to GitHub needs: [info, build-modpack, build-server, build-multimc] runs-on: ubuntu-latest - if: ${{ needs.info.outputs.release_exists == 'false'}} + if: needs.info.outputs.release_exists == 'false' outputs: url: ${{ steps.release.outputs.url }} @@ -417,7 +431,7 @@ jobs: name: 🚀 Release to CurseForge needs: [info, build-modpack, build-server, release-github] runs-on: ubuntu-latest - if: ${{ needs.info.outputs.release_exists == 'false'}} + if: needs.info.outputs.release_exists == 'false' outputs: id: ${{ steps.release.outputs.id }} From 692d0a444c9b2feb6e8ae05f71b9d55d9cdbfbea Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 01:48:33 +0500 Subject: [PATCH 04/10] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14542017d..3e42579f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: changelog: ${{ steps.changelog.outputs.description }} diff: ${{ steps.read_diff.outputs.diff }} exists: ${{ steps.check_tag.outputs.exists }} - release_exists: ${{ steps.check_tag.outputs.exists && github.env.DEV_ENVIRONMENT }} + release_exists: ${{ steps.check_tag.outputs.exists && env.DEV_ENVIRONMENT }} steps: - name: Checkout @@ -192,6 +192,7 @@ jobs: 📃 **Dev Environment**: `${{ env.DEV_ENVIRONMENT }}` 📃 **Tag Exists**: `${{ steps.check_tag.outputs.exists }}` + 📃 **A release will be made**: `${{ steps.check_tag.outputs.exists == 'true' && env.DEV_ENVIRONMENT == 'false' }}` ${{ steps.changelog.outputs.description }} From 0a4109055a3d1f52f9faaef99dc2276fc0b5371b Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 01:50:54 +0500 Subject: [PATCH 05/10] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e42579f5..42762451d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -192,7 +192,7 @@ jobs: 📃 **Dev Environment**: `${{ env.DEV_ENVIRONMENT }}` 📃 **Tag Exists**: `${{ steps.check_tag.outputs.exists }}` - 📃 **A release will be made**: `${{ steps.check_tag.outputs.exists == 'true' && env.DEV_ENVIRONMENT == 'false' }}` + 📃 **A release will be made**: `${{ steps.check_tag.outputs.exists && env.DEV_ENVIRONMENT }}` ${{ steps.changelog.outputs.description }} From 31adef602cbc4c9b5c980e005d6505dcabe76f47 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 01:57:34 +0500 Subject: [PATCH 06/10] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42762451d..a985fe852 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: changelog: ${{ steps.changelog.outputs.description }} diff: ${{ steps.read_diff.outputs.diff }} exists: ${{ steps.check_tag.outputs.exists }} - release_exists: ${{ steps.check_tag.outputs.exists && env.DEV_ENVIRONMENT }} + release_exists: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT }} steps: - name: Checkout @@ -192,7 +192,7 @@ jobs: 📃 **Dev Environment**: `${{ env.DEV_ENVIRONMENT }}` 📃 **Tag Exists**: `${{ steps.check_tag.outputs.exists }}` - 📃 **A release will be made**: `${{ steps.check_tag.outputs.exists && env.DEV_ENVIRONMENT }}` + 📃 **A release will be made**: `${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT }}` ${{ steps.changelog.outputs.description }} From 54534abaadb8f10827a27103ec262ead8cb78990 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 02:16:56 +0500 Subject: [PATCH 07/10] Update build.yml --- .github/workflows/build.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a985fe852..6e45e6b03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: changelog: ${{ steps.changelog.outputs.description }} diff: ${{ steps.read_diff.outputs.diff }} exists: ${{ steps.check_tag.outputs.exists }} - release_exists: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT }} + make_release: ${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'false' }} steps: - name: Checkout @@ -192,7 +192,7 @@ jobs: 📃 **Dev Environment**: `${{ env.DEV_ENVIRONMENT }}` 📃 **Tag Exists**: `${{ steps.check_tag.outputs.exists }}` - 📃 **A release will be made**: `${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT }}` + 📃 **Make Release**: `${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'false' }}` ${{ steps.changelog.outputs.description }} @@ -214,10 +214,8 @@ jobs: echo "Project Version: ${{ needs.info.outputs.project_version }}" echo "Project Name: ${{ needs.info.outputs.project_name }}" echo "Project Full Name: ${{ needs.info.outputs.project_full_name }}" - echo "Changelog: ${{ needs.info.outputs.changelog }}" - echo "Diff: ${{ needs.info.outputs.diff }}" echo "Exists: ${{ needs.info.outputs.exists }}" - echo "Release Exists: ${{ needs.info.outputs.release_exists }}" + echo "Release Exists: ${{ needs.info.outputs.make_release }}" echo "Dev Environment: ${{ env.DEV_ENVIRONMENT }}" - name: 🔄 Replace strings @@ -363,7 +361,7 @@ jobs: name: 🚀 Release to GitHub needs: [info, build-modpack, build-server, build-multimc] runs-on: ubuntu-latest - if: needs.info.outputs.release_exists == 'false' + if: ${{ needs.info.outputs.make_release }} outputs: url: ${{ steps.release.outputs.url }} @@ -432,7 +430,7 @@ jobs: name: 🚀 Release to CurseForge needs: [info, build-modpack, build-server, release-github] runs-on: ubuntu-latest - if: needs.info.outputs.release_exists == 'false' + if: ${{ needs.info.outputs.make_release }} outputs: id: ${{ steps.release.outputs.id }} From 5ad9f0e5e2245f374431ca9c603ef79424315116 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 02:23:40 +0500 Subject: [PATCH 08/10] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e45e6b03..14b54a1fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -361,7 +361,7 @@ jobs: name: 🚀 Release to GitHub needs: [info, build-modpack, build-server, build-multimc] runs-on: ubuntu-latest - if: ${{ needs.info.outputs.make_release }} + if: ${{ needs.info.outputs.make_release == 'true' }} outputs: url: ${{ steps.release.outputs.url }} From 2d11eb7aee99d1e6e496ca056fde2a0db1e3ff77 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 02:30:08 +0500 Subject: [PATCH 09/10] Update build.yml --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14b54a1fc..edd8d805f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -415,6 +415,7 @@ jobs: with: name: ${{ needs.info.outputs.project_version }} tag_name: ${{ needs.info.outputs.project_version }} + target_commitish: ${{ github.ref_name }} body: | ${{ needs.info.outputs.changelog }} ${{ steps.format_diff.outputs.text }} @@ -430,7 +431,7 @@ jobs: name: 🚀 Release to CurseForge needs: [info, build-modpack, build-server, release-github] runs-on: ubuntu-latest - if: ${{ needs.info.outputs.make_release }} + if: false outputs: id: ${{ steps.release.outputs.id }} @@ -528,6 +529,7 @@ jobs: name: 📱 Discord Message needs: [info, release-curseforge, release-github] runs-on: ubuntu-latest + if: false steps: - name: ✂️ Truncate Changelog id: truncated From 9c44e6298deac4a8ae7e6f77af34ce154c2119d6 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sat, 19 Apr 2025 02:34:25 +0500 Subject: [PATCH 10/10] final --- .github/workflows/build.yml | 14 +------------- CHANGELOG.md | 2 +- pakku.json | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index edd8d805f..430acffc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -207,17 +207,6 @@ jobs: - name: Checkout uses: actions/checkout@v4.2.2 - - name: Debug - shell: bash - run: | - echo "Debugging..." - echo "Project Version: ${{ needs.info.outputs.project_version }}" - echo "Project Name: ${{ needs.info.outputs.project_name }}" - echo "Project Full Name: ${{ needs.info.outputs.project_full_name }}" - echo "Exists: ${{ needs.info.outputs.exists }}" - echo "Release Exists: ${{ needs.info.outputs.make_release }}" - echo "Dev Environment: ${{ env.DEV_ENVIRONMENT }}" - - name: 🔄 Replace strings shell: bash run: | @@ -431,7 +420,7 @@ jobs: name: 🚀 Release to CurseForge needs: [info, build-modpack, build-server, release-github] runs-on: ubuntu-latest - if: false + if: ${{ needs.info.outputs.make_release == 'true' }} outputs: id: ${{ steps.release.outputs.id }} @@ -529,7 +518,6 @@ jobs: name: 📱 Discord Message needs: [info, release-curseforge, release-github] runs-on: ubuntu-latest - if: false steps: - name: ✂️ Truncate Changelog id: truncated diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f3ce408e..0535a771f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.9.2] +## [Unreleased] ### Changes ## [0.9.1] - 18.04.2025 diff --git a/pakku.json b/pakku.json index 681652810..796b3396b 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.2", + "version": "0.9.1", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [