@@ -45,33 +45,54 @@ jobs:
4545 path : Remotely
4646 ref : ${{ inputs.remotely_ref != '' && inputs.remotely_ref || github.ref }}
4747
48+ - name : Load sibling repository pins
49+ working-directory : Remotely
50+ run : |
51+ set -a
52+ source ci/sibling-pins.env
53+ set +a
54+ echo "RESCREEN_REF=${RESCREEN_REF}" >> "$GITHUB_ENV"
55+ echo "REMODEL_REF=${REMODEL_REF}" >> "$GITHUB_ENV"
56+ echo "REBASE_REF=${REBASE_REF}" >> "$GITHUB_ENV"
57+
4858 - name : Checkout ReScreen
4959 uses : actions/checkout@v4
5060 with :
5161 repository : RedxAx/ReScreen
5262 token : ${{ secrets.REPROJECTS_PAT }}
5363 path : ReScreen
64+ ref : ${{ env.RESCREEN_REF }}
5465
5566 - name : Checkout Remodel
5667 uses : actions/checkout@v4
5768 with :
5869 repository : RedxAx/Remodel
5970 token : ${{ secrets.REPROJECTS_PAT }}
6071 path : Remodel
72+ ref : ${{ env.REMODEL_REF }}
6173
6274 - name : Checkout Rebase
6375 uses : actions/checkout@v4
6476 with :
6577 repository : RedxAx/Rebase
6678 token : ${{ secrets.REPROJECTS_PAT }}
6779 path : Rebase
80+ ref : ${{ env.REBASE_REF }}
81+
82+ - name : Ensure Remodel Java 21 toolchain
83+ run : |
84+ chmod +x Remotely/RemotelyMod/scripts/ci-ensure-remodel-java21.sh
85+ Remotely/RemotelyMod/scripts/ci-ensure-remodel-java21.sh Remodel
6886
69- - name : Set up JDK 21
87+ - name : Set up JDK 21 and 25
7088 uses : actions/setup-java@v4
7189 with :
7290 distribution : temurin
73- java-version : ' 21'
91+ java-version : ' 21,25 '
7492 cache : gradle
93+ cache-dependency-path : |
94+ Remotely/gradle/wrapper/gradle-wrapper.properties
95+ Remotely/RemotelyMod/gradle/wrapper/gradle-wrapper.properties
7596
7697 - name : Preflight Remotely App jar
7798 working-directory : Remotely
@@ -82,24 +103,24 @@ jobs:
82103 - name : Ensure version project directories
83104 working-directory : Remotely/RemotelyMod
84105 run : |
85- chmod +x scripts/ensure-version-project-dirs.sh
106+ chmod +x scripts/ensure-version-project-dirs.sh scripts/ci-verify-version-layout.sh
86107 ./scripts/ensure-version-project-dirs.sh
108+ ./scripts/ci-verify-version-layout.sh
87109
88- - name : Build all RemotelyMod versions
89- working-directory : Remotely/RemotelyMod
90- run : |
91- chmod +x gradlew
92- ./gradlew buildAllVersions --no-daemon --stacktrace
93-
94- - name : Publish RemotelyMod
95- if : startsWith(inputs.goal, 'publish')
110+ - name : Run RemotelyMod Gradle goal
96111 working-directory : Remotely/RemotelyMod
97112 env :
98113 MODRINTH_TOKEN : ${{ secrets.MODRINTH_TOKEN }}
99114 CURSEFORGE_TOKEN : ${{ secrets.CURSEFORGE_TOKEN }}
100115 run : |
101116 chmod +x gradlew
102- ./gradlew ${{ inputs.goal }} --no-daemon --stacktrace
117+ if [[ "${{ inputs.goal }}" == buildAllVersions ]]; then
118+ ./gradlew buildAllVersions --no-daemon --stacktrace
119+ elif [[ "${{ inputs.goal }}" == publish* ]]; then
120+ ./gradlew buildAllVersions "${{ inputs.goal }}" --no-daemon --stacktrace
121+ else
122+ ./gradlew "${{ inputs.goal }}" --no-daemon --stacktrace
123+ fi
103124
104125 - name : Upload mod jars
105126 uses : actions/upload-artifact@v4
0 commit comments