diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ca7164b..32dcc60a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,16 @@ jobs: with: fetch-depth: 0 + - name: Validate tag release branch + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') + shell: bash + run: | + git fetch --no-tags origin '+refs/heads/1.21.1:refs/remotes/origin/1.21.1' + if ! git merge-base --is-ancestor "$GITHUB_SHA" origin/1.21.1; then + echo "::error::Tag $GITHUB_REF_NAME points to $GITHUB_SHA, which is not contained in origin/1.21.1." + exit 1 + fi + - name: Set up JDK 21 uses: actions/setup-java@v4 with: diff --git a/build.gradle b/build.gradle index 2afde484..362f5c18 100644 --- a/build.gradle +++ b/build.gradle @@ -9,15 +9,19 @@ version = mod_version group = mod_group_id repositories { - mavenLocal() - maven { - name = 'Aliyun Public' - url = 'https://maven.aliyun.com/repository/public' - } - maven { - name = 'Aliyun Central' - url = 'https://maven.aliyun.com/repository/central' + exclusiveContent { + forRepository { + maven { + name = 'CurseMaven' + url = 'https://cursemaven.com' + } + } + filter { + includeGroup 'curse.maven' + } } + + mavenLocal() mavenCentral() maven { name = 'NeoForge' @@ -31,10 +35,6 @@ repositories { name = 'Registrate' url = 'https://maven.ithundxr.dev/snapshots' } - maven { - name = 'CurseMaven' - url = 'https://cursemaven.com' - } maven { name = 'Jared Maven' url = 'https://maven.blamejared.com' diff --git a/settings.gradle b/settings.gradle index e8c1fb04..42c43563 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,16 +1,20 @@ pluginManagement { repositories { - mavenLocal() - maven { - name = 'Aliyun Gradle Plugin' - url = 'https://maven.aliyun.com/repository/gradle-plugin' - } - maven { - name = 'Aliyun Public' - url = 'https://maven.aliyun.com/repository/public' + exclusiveContent { + forRepository { + maven { + name = 'NeoForge' + url = 'https://maven.neoforged.net/releases' + } + } + filter { + includeGroup 'net.neoforged' + includeGroup 'net.neoforged.moddev' + } } + + mavenLocal() gradlePluginPortal() - maven { url = 'https://maven.neoforged.net/releases' } } }