Merge pull request #2955 from Multiverse/tag-input-inconsistent

fix: Tag name and input inconsistency
This commit is contained in:
Jeremy Wood 2023-08-21 23:29:55 -04:00 committed by GitHub
commit 73e0b30836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions

View File

@ -17,15 +17,15 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
tag: ${{ steps.release.outputs.tag_name }} tag: ${{ github.event.inputs.version }}
- name: Download release artifact - name: Download release artifact
id: release-artifact id: release-artifact
uses: dsaltares/fetch-gh-release-asset@1.1.1 uses: dsaltares/fetch-gh-release-asset@1.1.1
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
version: tags/${{ github.event.inputs.version }} version: tags/${{ steps.release-info.outputs.tag_name }}
file: multiverse-core-${{ github.event.inputs.version }}.jar file: multiverse-core-${{ steps.release-info.outputs.tag_name }}.jar
- name: Parse release type - name: Parse release type
run: | run: |
@ -40,7 +40,7 @@ jobs:
with: with:
api_token: ${{ secrets.DBO_UPLOAD_API_TOKEN }} api_token: ${{ secrets.DBO_UPLOAD_API_TOKEN }}
project_id: 30765 project_id: 30765
changelog: ${{ steps.release-artifact.outputs.body }} changelog: ${{ steps.release-info.outputs.body }}
changelog_type: markdown changelog_type: markdown
display_name: ${{ steps.release-artifact.outputs.version }} display_name: ${{ steps.release-artifact.outputs.version }}
game_versions: 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.18.1, 1.18.2, 1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4, 1.20, 1.20.1 game_versions: 1.13, 1.14, 1.15, 1.16, 1.17, 1.18, 1.18.1, 1.18.2, 1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4, 1.20, 1.20.1

View File

@ -17,16 +17,16 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
tag: ${{ steps.release.outputs.tag_name }} tag: ${{ github.event.inputs.version }}
- name: Modify version scheme - name: Modify version scheme
run: | run: |
if [[ "${{ steps.release.outputs.tag_name }}" == *"pre"* ]]; then if [[ "${{ steps.release-info.outputs.tag_name }}" == *"pre"* ]]; then
echo "Replacing prerelease version scheme with SNAPSHOT" echo "Replacing prerelease version scheme with SNAPSHOT"
echo "VERSION=$(echo ${{ steps.release.outputs.tag_name }} | sed -E 's/-pre.*/-SNAPSHOT/')" >> $GITHUB_ENV echo "VERSION=$(echo ${{ steps.release-info.outputs.tag_name }} | sed -E 's/-pre.*/-SNAPSHOT/')" >> $GITHUB_ENV
else else
echo "Using release version scheme" echo "Using release version scheme"
echo "VERSION=${{ steps.release.outputs.tag_name }}" >> $GITHUB_ENV echo "VERSION=${{ steps.release-info.outputs.tag_name }}" >> $GITHUB_ENV
fi fi
- name: Parse release type - name: Parse release type

View File

@ -76,7 +76,7 @@ jobs:
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
version: tags/${{ steps.release.outputs.tag_name }} version: tags/${{ steps.release.outputs.tag_name }}
file: multiverse-core-${{ github.event.inputs.version }}.jar file: multiverse-core-${{ steps.release.outputs.tag_name }}.jar
- name: Upload to modrinth.com - name: Upload to modrinth.com
uses: gradle/gradle-build-action@v2 uses: gradle/gradle-build-action@v2