Allow non-1.20.1 or 1.21 branch releases by jurrejelle · Pull Request #4748 · GregTechCEu/GregTech-Modern

jurrejelle · 2026-03-22T21:49:45Z

What

Allow non-1.20.1 or 1.21 releases

Implementation Details

Pass the tag name to the publish action and do most stuff based on that instead of version number
It does still make the version bump / changelog PR to/from the 1.20.1 or 1.21 branch bcs idt it can do that off of tags since they're not branches

How Was This Tested

Not, needs to be tested still somehow? Also needs like 4x review before we mess up another release lol

.github/workflows/publish.yml

.github/workflows/publish-on-release.yml

      simulate: ${{ startsWith(github.event.release.name, 'simulate') || github.repository_owner != 'GregTechCEu' }}
-      branch: '1.20.1'
      tag-name: ${{ github.ref_name }}
+      version: '1.20.1'


screret · 2026-03-23T07:58:25Z

.github/workflows/publish-on-release.yml

    name: Metadata
    runs-on: ubuntu-latest
    outputs:
      CHANGELOG: ${{ steps.changelog.outputs.changelog }}


add this after CHANGELOG:

VERSION: ${{ (contains(github.ref_name, '1.21') || !contains(github.ref_name, '1.20.1')) && '1.21.1' || '1.20.1' }}

screret · 2026-03-23T08:00:40Z

.github/workflows/publish-on-release.yml

          CONFIG: ${{ contains(github.ref_name, '1.21') && '-1.21' || '' }}
        uses: mikepenz/release-changelog-builder-action@v5
        with:
          configuration: './.github/json/config${{ env.CONFIG }}.json'


the files in .github/json/config/ should probably be changed so that the 1.20 branch only contains 1.20's files (and vice versa).
That way that CONFIG value doesn't need to exist and that directory wouldn't be nearly as odd-looking as it is now

screret · 2026-03-23T08:02:46Z

.github/workflows/publish-on-release.yml

          fetchViaCommits: true
          failOnError: true

  publish-20:


This replaces both publish-20 and publish-21. It also requires adding the third suggestion.
I can't format it as a proper suggestion because github doesn't like adding suggestions to unchanged lines.

publish: name: Publish needs: [ meta ] secrets: inherit uses: ./.github/workflows/publish.yml with: simulate: ${{ startsWith(github.event.release.name, 'simulate') || github.repository_owner != 'GregTechCEu' }} tag-name: ${{ github.ref_name }} version: ${{ needs.meta.outputs.VERSION }} release-body: ${{ github.event.release.body }} changelog-body: ${{ needs.meta.outputs.CHANGELOG }}

screret · 2026-03-23T08:04:23Z

.github/workflows/publish.yml

+          MC_VERSION: ${{ inputs.version == '1.21' && '1.21.1' || '1.20.1' }}
+          LOADER: ${{ inputs.version == '1.21' && 'neoforge' || 'forge' }}
+          JAVA: ${{ inputs.version == '1.21' && '21' || '17' }}
+          VERSION_TYPE: ${{ inputs.version == '1.21' && 'alpha' || 'beta' }}


1.21 files published as betas to Modrinth but as alphas to curse. oops?
They should probably be alphas on both, right?

screret · 2026-03-23T08:04:53Z

.github/workflows/publish.yml

+          MC_VERSION: ${{ inputs.version == '1.21' && '1.21.1' || '1.20.1' }}
+          LOADER: ${{ inputs.version == '1.21' && 'neoforge' || 'forge' }}
+          JAVA: ${{ inputs.version == '1.21' && '21' || '17' }}
+          VERSION_TYPE: ${{ inputs.version == '1.21' && 'beta' || 'beta' }}


Suggested change

MC_VERSION: ${{ inputs.version == '1.21' && '1.21.1' || '1.20.1' }}

LOADER: ${{ inputs.version == '1.21' && 'neoforge' || 'forge' }}

JAVA: ${{ inputs.version == '1.21' && '21' || '17' }}

VERSION_TYPE: ${{ inputs.version == '1.21' && 'beta' || 'beta' }}

MC_VERSION: ${{ inputs.version }}

LOADER: ${{ inputs.version == '1.21.1' && 'neoforge' || 'forge' }}

JAVA: ${{ inputs.version == '1.21.1' && '21' || '17' }}

VERSION_TYPE: ${{ inputs.version == '1.21.1' && 'alpha' || 'beta' }}

MC_VERSION is just inputs.version now because the suggestion in the meta job in publish-on-release makes the 1.21 branch have its version set to 1.21.1 by default.

screret · 2026-03-23T08:05:11Z

.github/workflows/publish.yml

+          MC_VERSION: ${{ inputs.version == '1.21' && '1.21.1' || '1.20.1' }}
+          LOADER: ${{ inputs.version == '1.21' && 'neoforge' || 'forge' }}
+          JAVA: ${{ inputs.version == '1.21' && '21' || '17' }}
+          VERSION_TYPE: ${{ inputs.version == '1.21' && 'alpha' || 'beta' }}


Suggested change

MC_VERSION: ${{ inputs.version == '1.21' && '1.21.1' || '1.20.1' }}

LOADER: ${{ inputs.version == '1.21' && 'neoforge' || 'forge' }}

JAVA: ${{ inputs.version == '1.21' && '21' || '17' }}

VERSION_TYPE: ${{ inputs.version == '1.21' && 'alpha' || 'beta' }}

MC_VERSION: ${{ inputs.version }}

LOADER: ${{ inputs.version == '1.21.1' && 'neoforge' || 'forge' }}

JAVA: ${{ inputs.version == '1.21.1' && '21' || '17' }}

VERSION_TYPE: ${{ inputs.version == '1.21.1' && 'alpha' || 'beta' }}

screret · 2026-03-23T08:06:55Z

.github/workflows/publish.yml

-      tag-name:
-        description: 'Tag to upload to'
+      version:
+        description: 'Version identifier; 1.20.1 or 1.21'


Suggested change

description: 'Version identifier; 1.20.1 or 1.21'

description: 'Version identifier; 1.20.1 or 1.21.1'

htmlcsjs

Tested on a fork at https://github.com/IssueFloppa/GregTech-Modern, Worked but need to make sure to propagate this change to any tags we are releasing from

Allow non-1.20.1 or 1.21 releases

b788f18

jurrejelle requested a review from a team as a code owner March 22, 2026 21:49

jurrejelle added ignore changelog PR should not be added to the changelog. type: bugfix General bug fixes 1.20.1 Release: Patch - 0.0.X Smaller changes that either are bug fixes or very minor tweaks. labels Mar 22, 2026

htmlcsjs reviewed Mar 22, 2026

View reviewed changes

.github/workflows/publish.yml Show resolved Hide resolved

screret reviewed Mar 23, 2026

View reviewed changes

htmlcsjs approved these changes Mar 23, 2026

View reviewed changes

Modrinth 1.21 releases are alpha

860bcf9

htmlcsjs approved these changes Mar 24, 2026

View reviewed changes

jurrejelle merged commit a72bf74 into 1.20.1 Mar 24, 2026
4 checks passed

jurrejelle deleted the jj/fix-release-branches branch March 24, 2026 07:56

jurrejelle added a commit that referenced this pull request Mar 24, 2026

Allow non-1.20.1 or 1.21 branch releases (#4748)

021c7a6

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow non-1.20.1 or 1.21 branch releases#4748

Allow non-1.20.1 or 1.21 branch releases#4748
jurrejelle merged 2 commits into1.20.1from
jj/fix-release-branches

jurrejelle commented Mar 22, 2026

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

screret Mar 23, 2026

Uh oh!

screret Mar 23, 2026

Uh oh!

screret Mar 23, 2026

Uh oh!

screret Mar 23, 2026

Uh oh!

screret Mar 23, 2026

Uh oh!

screret Mar 23, 2026

Uh oh!

screret Mar 23, 2026

Uh oh!

screret Mar 23, 2026

Uh oh!

htmlcsjs left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	description: 'Version identifier; 1.20.1 or 1.21'
	description: 'Version identifier; 1.20.1 or 1.21.1'

Conversation

jurrejelle commented Mar 22, 2026

What

Implementation Details

How Was This Tested

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

htmlcsjs left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants