diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index eb069b5da..2fa98b937 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -123,107 +123,111 @@ jobs: path: ${{ env.OUTPUT }}/* retention-days: 1 - # publish-modrinth: - # needs: build - # runs-on: ubuntu-latest - # strategy: - # matrix: - # include: - # # - version: "1.21.1" - # # loader: "neoforged" - # - version: "1.21.1" - # loader: "fabric" - # - version: "1.21.4" - # loader: "fabric" - # # - version: "1.21.5" - # # loader: "neoforged" - # - version: "1.21.5" - # loader: "fabric" - # max-parallel: 1 # Ensures sequential uploads - # env: - # PACK_NAME: Re-Console - # VERSION: ${{ needs.build.outputs.version }} - # COMMIT_SHORT_SHA: ${{ needs.build.outputs.commit-sha }} + publish-modrinth: + needs: build + runs-on: ubuntu-latest + strategy: + matrix: + include: + - version: "1.20.1" + loader: "fabric" + - version: "1.20.4" + loader: "fabric" + - version: "1.21.1" + loader: "fabric" + - version: "1.21.3" + loader: "fabric" + - version: "1.21.4" + loader: "fabric" + - version: "1.21.5" + loader: "fabric" + max-parallel: 1 # Ensures sequential uploads + env: + PACK_NAME: Re-Console + VERSION: ${{ needs.build.outputs.version }} + COMMIT_SHORT_SHA: ${{ needs.build.outputs.commit-sha }} - # steps: - # - name: Download build artifacts - # uses: actions/download-artifact@v4 - # with: - # name: modrinth-${{ matrix.loader }}-${{ matrix.version }} - # path: artifacts + steps: + - name: Download build artifacts + uses: actions/download-artifact@v4 + with: + name: modrinth-${{ matrix.loader }}-${{ matrix.version }} + path: artifacts - # - name: Publish to Modrinth - # uses: Kir-Antipov/mc-publish@v3.3 - # with: - # modrinth-id: legacy-minecraft - # modrinth-token: ${{ secrets.MR }} + - name: Publish to Modrinth + uses: Kir-Antipov/mc-publish@v3.3 + with: + modrinth-id: legacy-minecraft + modrinth-token: ${{ secrets.MR }} - # files: | - # artifacts/${{ env.PACK_NAME }}-${{ matrix.version }}-${{ matrix.loader }}-${{ env.VERSION }}-modrinth.mrpack + files: | + artifacts/${{ env.PACK_NAME }}-${{ matrix.version }}-${{ matrix.loader }}-${{ env.VERSION }}-modrinth.mrpack - # name: "RC ${{ env.VERSION }} (${{ matrix.loader == 'neoforged' && 'NeoForge' || 'Fabric' }} ${{ matrix.version }})" - # version: "${{ env.VERSION }}-${{ matrix.loader }}-${{ matrix.version }}" - # version-type: ${{ github.event_name == 'release' && (contains(github.event.release.tag_name, 'alpha') && 'alpha' || contains(github.event.release.tag_name, 'beta') && 'beta' || 'release') || 'alpha' }} + name: "RC ${{ env.VERSION }} (${{ matrix.loader == 'neoforged' && 'NeoForge' || 'Fabric' }} ${{ matrix.version }})" + version: "${{ env.VERSION }}-${{ matrix.loader }}-${{ matrix.version }}" + version-type: ${{ github.event_name == 'release' && (contains(github.event.release.tag_name, 'alpha') && 'alpha' || contains(github.event.release.tag_name, 'beta') && 'beta' || 'release') || 'alpha' }} - # loaders: ${{ matrix.loader == 'neoforged' && 'neoforge' || matrix.loader }} - # game-versions: ${{ matrix.version }} + loaders: ${{ matrix.loader == 'neoforged' && 'neoforge' || matrix.loader }} + game-versions: ${{ matrix.version }} - # changelog: ${{ github.event.release.body || format('Development build - {0}', env.COMMIT_SHORT_SHA) }} + changelog: ${{ github.event.release.body || format('Development build - {0}', env.COMMIT_SHORT_SHA) }} - # retry-attempts: 3 - # retry-delay: 10000 - # fail-mode: warn + retry-attempts: 3 + retry-delay: 10000 + fail-mode: warn - # publish-curseforge: - # needs: build - # runs-on: ubuntu-latest - # strategy: - # matrix: - # include: - # # - version: "1.21.1" - # # loader: "neoforged" - # - version: "1.21.1" - # loader: "fabric" - # - version: "1.21.4" - # loader: "fabric" - # # - version: "1.21.5" - # # loader: "neoforged" - # - version: "1.21.5" - # loader: "fabric" - # max-parallel: 1 # Ensures sequential uploads - # env: - # PACK_NAME: Re-Console - # VERSION: ${{ needs.build.outputs.version }} - # COMMIT_SHORT_SHA: ${{ needs.build.outputs.commit-sha }} + publish-curseforge: + needs: build + runs-on: ubuntu-latest + strategy: + matrix: + include: + - version: "1.20.1" + loader: "fabric" + - version: "1.20.4" + loader: "fabric" + - version: "1.21.1" + loader: "fabric" + - version: "1.21.3" + loader: "fabric" + - version: "1.21.4" + loader: "fabric" + - version: "1.21.5" + loader: "fabric" + max-parallel: 1 # Ensures sequential uploads + env: + PACK_NAME: Re-Console + VERSION: ${{ needs.build.outputs.version }} + COMMIT_SHORT_SHA: ${{ needs.build.outputs.commit-sha }} - # steps: - # - name: Download build artifacts - # uses: actions/download-artifact@v4 - # with: - # name: curseforge-${{ matrix.loader }}-${{ matrix.version }} - # path: artifacts + steps: + - name: Download build artifacts + uses: actions/download-artifact@v4 + with: + name: curseforge-${{ matrix.loader }}-${{ matrix.version }} + path: artifacts - # - name: Publish to CurseForge - # uses: Kir-Antipov/mc-publish@v3.3 - # with: - # curseforge-id: re-console - # curseforge-token: ${{ secrets.CF }} + - name: Publish to CurseForge + uses: Kir-Antipov/mc-publish@v3.3 + with: + curseforge-id: re-console + curseforge-token: ${{ secrets.CF }} - # files: | - # artifacts/${{ env.PACK_NAME }}-${{ matrix.version }}-${{ matrix.loader }}-${{ env.VERSION }}-curseforge.zip + files: | + artifacts/${{ env.PACK_NAME }}-${{ matrix.version }}-${{ matrix.loader }}-${{ env.VERSION }}-curseforge.zip - # name: "RC ${{ env.VERSION }} (${{ matrix.loader == 'neoforged' && 'NeoForge' || 'Fabric' }} ${{ matrix.version }})" - # version: "${{ env.VERSION }}-${{ matrix.loader }}-${{ matrix.version }}" - # version-type: ${{ github.event_name == 'release' && (contains(github.event.release.tag_name, 'alpha') && 'alpha' || contains(github.event.release.tag_name, 'beta') && 'beta' || 'release') || 'alpha' }} + name: "RC ${{ env.VERSION }} (${{ matrix.loader == 'neoforged' && 'NeoForge' || 'Fabric' }} ${{ matrix.version }})" + version: "${{ env.VERSION }}-${{ matrix.loader }}-${{ matrix.version }}" + version-type: ${{ github.event_name == 'release' && (contains(github.event.release.tag_name, 'alpha') && 'alpha' || contains(github.event.release.tag_name, 'beta') && 'beta' || 'release') || 'alpha' }} - # loaders: ${{ matrix.loader == 'neoforged' && 'neoforge' || matrix.loader }} - # game-versions: ${{ matrix.version }} + loaders: ${{ matrix.loader == 'neoforged' && 'neoforge' || matrix.loader }} + game-versions: ${{ matrix.version }} - # changelog: ${{ github.event.release.body || format('Development build - {0}', env.COMMIT_SHORT_SHA) }} + changelog: ${{ github.event.release.body || format('Development build - {0}', env.COMMIT_SHORT_SHA) }} - # retry-attempts: 3 - # retry-delay: 10000 - # fail-mode: warn + retry-attempts: 3 + retry-delay: 10000 + fail-mode: warn publish-github: needs: build diff --git a/.github/workflows/rc-lite-nightly.yml b/.github/workflows/rc-lite-nightly.yml index a759200e7..4fd33660c 100644 --- a/.github/workflows/rc-lite-nightly.yml +++ b/.github/workflows/rc-lite-nightly.yml @@ -12,7 +12,58 @@ jobs: build: strategy: matrix: - version: ['1.21.1','1.21.4','1.21.5'] + include: + # modrinth + - version: "1.20.1" + loader: "fabric" + platform: "modrinth" + file_ext: "mrpack" + - version: "1.20.4" + loader: "fabric" + platform: "modrinth" + file_ext: "mrpack" + - version: "1.21.1" + loader: "fabric" + platform: "modrinth" + file_ext: "mrpack" + - version: "1.21.3" + loader: "fabric" + platform: "modrinth" + file_ext: "mrpack" + - version: "1.21.4" + loader: "fabric" + platform: "modrinth" + file_ext: "mrpack" + - version: "1.21.5" + loader: "fabric" + platform: "modrinth" + file_ext: "mrpack" + # curseforge + - version: "1.20.1" + loader: "fabric" + platform: "curseforge" + file_ext: "zip" + - version: "1.20.4" + loader: "fabric" + platform: "curseforge" + file_ext: "zip" + - version: "1.21.1" + loader: "fabric" + platform: "curseforge" + file_ext: "zip" + - version: "1.21.3" + loader: "fabric" + platform: "curseforge" + file_ext: "zip" + - version: "1.21.4" + loader: "fabric" + platform: "curseforge" + file_ext: "zip" + - version: "1.21.5" + loader: "fabric" + platform: "curseforge" + file_ext: "zip" + runs-on: ubuntu-latest outputs: commit_sha: ${{ steps.vars.outputs.commit_sha }} @@ -39,21 +90,21 @@ jobs: echo "COMMIT_SHORT_SHA=$shortSha" >> $GITHUB_ENV echo "commit_sha=$shortSha" >> $GITHUB_OUTPUT - - name: Build ${{ matrix.version }} + - name: Build ${{ matrix.version }}-${{ matrix.loader }}-${{ matrix.platform }} run: | - mkdir Lite-Modrinth-${{ matrix.version }}-temp - cp -r ./versions/vanilla/src/re-console-lite/modrinth/fabric/${{ matrix.version }}/* ./Lite-Modrinth-${{ matrix.version }}-temp/ - cp ./LICENSE ./Lite-Modrinth-${{ matrix.version }}-temp/ - cp ./README.md ./Lite-Modrinth-${{ matrix.version }}-temp/ - cd ./Lite-Modrinth-${{ matrix.version }}-temp/ + mkdir RC-Lite-${{ matrix.platform }}-${{ matrix.loader }}-${{ matrix.version }}-temp + cp -r ./versions/vanilla/src/re-console-lite/${{ matrix.platform }}/${{ matrix.loader }}/${{ matrix.version }}/* ./RC-Lite-${{ matrix.platform }}-${{ matrix.loader }}-${{ matrix.version }}-temp/ + cp ./LICENSE ./RC-Lite-${{ matrix.platform }}-${{ matrix.loader }}-${{ matrix.version }}-temp/ + cp ./README.md ./RC-Lite-${{ matrix.platform }}-${{ matrix.loader }}-${{ matrix.version }}-temp/ + cd ./RC-Lite-${{ matrix.platform }}-${{ matrix.loader }}-${{ matrix.version }}-temp/ packwiz refresh mkdir -p ../$OUTPUT - packwiz modrinth export --output ../${OUTPUT}/${PACK_NAME}-${{ matrix.version }}-dev-${{ env.COMMIT_SHORT_SHA }}.mrpack + packwiz ${{ matrix.platform }} export --output ../${OUTPUT}/${PACK_NAME}-${{ matrix.version }}-${{ matrix.loader }}-dev-${{ matrix.platform }}-${{ env.COMMIT_SHORT_SHA }}.${{ matrix.file_ext }} - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: "Re-Console-Lite-${{ matrix.version }}-dev-${{ env.COMMIT_SHORT_SHA }}" + name: "Re-Console-Lite-${{ matrix.version }}-${{ matrix.loader }}-${{ matrix.platform }}-dev-${{ env.COMMIT_SHORT_SHA }}" path: artifacts combine: @@ -64,14 +115,15 @@ jobs: uses: actions/download-artifact@v4 with: path: downloaded-artifacts - + - name: Combine artifacts run: | mkdir combined-artifacts find downloaded-artifacts -name "*.mrpack" -exec cp {} combined-artifacts/ \; - + find downloaded-artifacts -name "*.zip" -exec cp {} combined-artifacts/ \; + - name: Upload combined artifacts uses: actions/upload-artifact@v4 with: - name: "Re-Console-Lite-dev-${{ needs.build.outputs.commit_sha }}" + name: "Re-Console-dev-${{ needs.build.outputs.commit_sha }}" path: combined-artifacts \ No newline at end of file