diff --git a/.github/workflows/cut-release.yaml b/.github/workflows/cut-release.yaml deleted file mode 100644 index 2152e4cfc..000000000 --- a/.github/workflows/cut-release.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: Cut Release - -on: - workflow_dispatch: - inputs: - channel: - description: 'Release channel' - required: true - type: string - type: - description: 'Release type' - required: true - default: 'beta' - type: string - -jobs: - push-to-publish-branch: - name: Push to Publish Branch - runs-on: ubuntu-latest - steps: - - name: Checkout git repo - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Update publish branch - run: | - DEST_BRANCH="publish/$CHANNEL/$TYPE" - echo "Pushing commit from $GITHUB_SHA to $DEST_BRANCH" - - # Force push to publish branch - git push origin $DEST_BRANCH --force - - env: - CHANNEL: ${{ inputs.channel }} - TYPE: ${{ inputs.type }} \ No newline at end of file diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 21ba486c4..a6b69d5ee 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,11 +1,18 @@ # This workflow publishes commits to Maven -name: Publish Releases +name: Publish Release on: workflow_dispatch: - push: - branches: - - publish/** + inputs: + channel: + description: 'Release channel' + required: true + type: string + type: + description: 'Release type' + required: true + default: 'beta' + type: string jobs: build: @@ -22,10 +29,6 @@ jobs: - name: Resolve release type id: release_type run: | - # Extract release type from ref (refs/heads/publish/{channel}/{type}) - release_channel="$(echo $GITHUB_REF | sed -E 's/refs\/heads\/publish\/([a-zA-Z0-9.-]+)\/([a-zA-Z0-9.-]+)/\1/')" - release_type="$(echo $GITHUB_REF | sed -E 's/refs\/heads\/publish\/([a-zA-Z0-9.-]+)\/([a-zA-Z0-9.-]+)/\2/')" - case $release_type in "release") publish_maven=true @@ -62,6 +65,9 @@ jobs: echo "publish_gh_release=$publish_gh_release" >> $GITHUB_OUTPUT echo "version_format=$version_format" >> $GITHUB_OUTPUT echo "tag_format=$tag_format" >> $GITHUB_OUTPUT + ENV: + release_channel: ${{ inputs.channel }} + release_type: ${{ inputs.type }} # Install python and deps - name: Set up Python 3.12.1 diff --git a/.github/workflows/verify-pull-request.yaml b/.github/workflows/verify-pull-request.yaml index 94ac89138..3dccf8399 100644 --- a/.github/workflows/verify-pull-request.yaml +++ b/.github/workflows/verify-pull-request.yaml @@ -4,7 +4,7 @@ on: pull_request: branches: - main - - main-* + - main/** - feature/** jobs: diff --git a/README.md b/README.md index cf19f75aa..bee9cdc2a 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,12 @@ A Minecraft Forge mod all about Redstone circuity. -| Release Branch | MC Version | Status | -|------------------------|:----------:|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `publish/1.19/release` | 1.19.2 | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | -| `publish/1.19/beta` | 1.19.2 | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | -| `publish/1.18/release` | 1.18.2 | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | -| `publish/1.18/beta` | 1.18.2 | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | -| `publish/1.16/release` | 1.16.5 | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.16-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | -| `publish/1.16/beta` | 1.16.5 | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.16-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | -| `publish/1.15/beta` | 1.15.2 | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.15-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | +| MC Version | Branch | Latest Release | Latest Beta | Status | +|:----------:|-------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------| +| 1.19.2 | `main` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.19-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | Active | +| 1.18.2 | `main/1.18` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.18-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | Maintainence | +| 1.16.5 | `main/1.16` | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.16-release.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.16-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | End-of-Life | +| 1.15.2 | `main/1.15` | N/A | [![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MrTJP/3ef501bc64c896a86fd706dfea8ba367/raw/projectred-badge-1.15-beta.json)](https://www.curseforge.com/minecraft/mc-mods/project-red-core) | End-of-Life | ## Development Environment Setup