Skip to content

Commit

Permalink
chore: Switch Preprocessor
Browse files Browse the repository at this point in the history
  • Loading branch information
null2264 committed Nov 19, 2023
1 parent bd6a9af commit bf3cef1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 24 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# Automatically build the project and run any configured tests for every push
# and submitted pull request. This can help catch issues that only occur on
# certain platforms or Java versions, and provides a first line of defence
# against bad commits.

name: build
on: [pull_request, push]

Expand All @@ -15,13 +10,11 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v3
with:
distribution: "temurin"
distribution: temurin
java-version: 17
- run: chmod +x ./gradlew
- name: Build with Gradle
run: ./gradlew build --stacktrace
env:
GITHUB_PAT: ${{ secrets.PAT }}
- name: Archive build results
run: tar -I zstd -cf build.tar.zst versions/*/build/libs
- name: Upload build folder
Expand All @@ -30,4 +23,4 @@ jobs:
name: build-artifacts
path: build.tar.zst
if-no-files-found: error
retention-days: 3
retention-days: 3
7 changes: 1 addition & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
- run: chmod +x ./gradlew
- name: Build with Gradle
run: ./gradlew build --stacktrace
env:
GITHUB_PAT: ${{ secrets.PAT }}
- name: Archive build results
run: tar -I zstd -cf build.tar.zst versions/*/build/libs
- name: Upload build and gradle folders
Expand Down Expand Up @@ -68,12 +66,9 @@ jobs:
- run: chmod +x ./gradlew
- name: Build with Gradle
run: ./gradlew build --stacktrace
env:
GITHUB_PAT: ${{ secrets.PAT }}
- name: Upload to CurseForge and Modrinth
run: ./gradlew publishMods --stacktrace --no-daemon --max-workers 1
env:
CHANGELOG: ${{ github.event.release.body }}
CURSEFORGE: ${{ secrets.CURSEFORGE }}
MODRINTH: ${{ secrets.MODRINTH }}
GITHUB_PAT: ${{ secrets.PAT }}
run: ./gradlew publishMods --stacktrace --no-daemon --max-workers 1
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "dev.architectury.loom" version "1.4-SNAPSHOT"
id "com.github.johnrengelman.shadow"
id "com.github.null2264.preprocess"
id "io.github.null2264.preprocess"
id "me.modmuss50.mod-publish-plugin" version "0.3.5"
}

Expand Down
4 changes: 2 additions & 2 deletions root.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.github.null2264.preprocess")
id("io.github.null2264.preprocess")
}

preprocess {
Expand Down Expand Up @@ -27,4 +27,4 @@ preprocess {
fabric12001.link(fabric11904)
fabric11904.link(fabric11902)
fabric11902.link(fabric11802)
}
}
7 changes: 1 addition & 6 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,7 @@ pluginManagement {
}
plugins {
id("com.github.johnrengelman.shadow") version("8.1.1")
}
resolutionStrategy {
eachPlugin {
if (requested.id.id == "com.github.null2264.preprocess")
useModule("com.github.null2264:Preprocessor:ba61239")
}
id("io.github.null2264.preprocess") version("1.0-SNAPSHOT")
}
}

Expand Down

0 comments on commit bf3cef1

Please sign in to comment.