From 29c7fa1646a6b8f85fb1aed34933b5e06a7d09de Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 20 May 2021 23:17:46 +0800 Subject: [PATCH 1/3] Bump to 1.15 because build numbers have reset Signed-off-by: shedaniel --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5b483415..58bd3007 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ supported_version=1.16.4/5 archives_base_name=architectury archives_base_name_snapshot=architectury-snapshot -base_version=1.14 +base_version=1.15 maven_group=me.shedaniel fabric_loader_version=0.11.1 From f6e86f7b73cb3e793c899d0053030427c35010ba Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 20 May 2021 19:44:28 +0200 Subject: [PATCH 2/3] Revert "Update to architectury plugin 3.2" This reverts commit 109c1997 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 34c91537..b357edce 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "architectury-plugin" version "3.2-SNAPSHOT" + id "architectury-plugin" version "3.1-SNAPSHOT" id "dev.architectury.loom" version "0.7.2-SNAPSHOT" apply false id "org.cadixdev.licenser" version "0.5.0" id "com.matthewprenger.cursegradle" version "1.4.0" apply false From d661265922f117f061884cc68e88d6e431f99df5 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 20 May 2021 22:53:10 +0200 Subject: [PATCH 3/3] Update pr.yml --- .github/workflows/pr.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b166a6b5..ba03c596 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,8 +20,6 @@ jobs: license: name: "Verify License integrity" runs-on: ubuntu-20.04 - if: | - !contains(github.event.head_commit.message, '[ci skip]') steps: - uses: actions/checkout@v2 @@ -71,7 +69,7 @@ jobs: java: [ 8, 15 ] # Build on Java 8 (version shipped with MC 1.16) and Java 15 (iirc the latest version supported by both loaders on 1.16) runs-on: ubuntu-20.04 if: | - !contains(github.event.head_commit.message, '[ci skip]') + contains( github.event.pull_request.labels.*.name, 'api') && !contains(github.event.pull_request.title, '[ci skip]') steps: - uses: actions/checkout@v2 @@ -123,7 +121,7 @@ jobs: cat $GITHUB_WORKSPACE/gradle.properties | grep ^base_version= >> $GITHUB_ENV - name: Create package name if: ${{ matrix.java == '8' }} # Only upload Java 8 artifacts for MC 1.16 - run: echo "package_name=[$minecraft_version] $archives_base_name-$base_version.${{ github.run_number }}" >> $GITHUB_ENV + run: echo "package_name=[$minecraft_version] $archives_base_name-$base_version-SNAPSHOT.PR${{ github.event.number }}" >> $GITHUB_ENV - uses: actions/upload-artifact@v2 if: ${{ matrix.java == '8' }} # Only upload Java 8 artifacts for MC 1.16 with: