Skip to content

Commit 1cb851b

Browse files
committed
Added 1.21.9/10 testing environments, added 1.21.8's to the main test task, updated skript versions on all but one of the most recent version testing environments, set paper version to 1.21.10
1 parent 42d74c0 commit 1cb851b

File tree

7 files changed

+119
-5
lines changed

7 files changed

+119
-5
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Paper 1.21.10
2+
3+
on:
4+
- push
5+
- pull_request
6+
7+
jobs:
8+
build:
9+
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
submodules: recursive
15+
- name: validate gradle wrapper
16+
uses: gradle/wrapper-validation-action@v2
17+
- name: Set up JDK 21
18+
uses: actions/setup-java@v4
19+
with:
20+
java-version: '21'
21+
distribution: 'adopt'
22+
cache: gradle
23+
- name: Grant execute permission for gradlew
24+
run: chmod +x gradlew
25+
- name: Build Skript and run test scripts
26+
run: ./gradlew clean luskTest_1_21_10
27+
- name: Upload Nightly Build
28+
uses: actions/upload-artifact@v4
29+
if: success()
30+
with:
31+
name: lusk-nightly.jar
32+
path: build/libs/*
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Paper 1.21.9
2+
3+
on:
4+
- push
5+
- pull_request
6+
7+
jobs:
8+
build:
9+
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
submodules: recursive
15+
- name: validate gradle wrapper
16+
uses: gradle/wrapper-validation-action@v2
17+
- name: Set up JDK 21
18+
uses: actions/setup-java@v4
19+
with:
20+
java-version: '21'
21+
distribution: 'adopt'
22+
cache: gradle
23+
- name: Grant execute permission for gradlew
24+
run: chmod +x gradlew
25+
- name: Build Skript and run test scripts
26+
run: ./gradlew clean luskTest_1_21_9
27+
- name: Upload Nightly Build
28+
uses: actions/upload-artifact@v4
29+
if: success()
30+
with:
31+
name: lusk-nightly.jar
32+
path: build/libs/*

build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ compileJava {
1010
options.encoding = "UTF-8"
1111
}
1212

13-
version = "1.3.9"
13+
version = "1.3.10"
1414

1515
def java16 = 16
1616
def java17 = 17
@@ -21,6 +21,7 @@ def latestJava = java21
2121

2222

2323
repositories {
24+
mavenLocal()
2425
mavenCentral()
2526
maven { url 'https://repo.papermc.io/repository/maven-public/' }
2627
maven { url 'https://oss.sonatype.org/content/groups/public/' }
@@ -32,13 +33,14 @@ repositories {
3233

3334
dependencies {
3435
implementation('org.jetbrains:annotations:20.1.0')
35-
compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
36+
compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
3637
compileOnly('com.github.SkriptLang:Skript:2.12.1')
3738
implementation('org.bstats:bstats-bukkit:3.0.2')
3839
implementation('com.vdurmont:semver4j:3.1.0')
3940
implementation('net.wesjd:anvilgui:1.10.8-SNAPSHOT')
4041
shadow('junit:junit:3.8.2')
4142

43+
implementation("it.jakegblp:nms-shade:1.0.0")
4244
implementation project(":version_adapter")
4345
implementation project(":skript_v2_6_4")
4446
implementation project(":skript_v2_7_3")
@@ -158,6 +160,8 @@ createTestTask('luskTest_1_21_5', 'Runs tests on Paper 1.21.5.', environments +
158160
createTestTask('luskTest_1_21_6', 'Runs tests on Paper 1.21.6.', environments + 'paper-1.21.6.json', java21, -1)
159161
createTestTask('luskTest_1_21_7', 'Runs tests on Paper 1.21.7.', environments + 'paper-1.21.7.json', java21, -1)
160162
createTestTask('luskTest_1_21_8', 'Runs tests on Paper 1.21.8.', environments + 'paper-1.21.8.json', java21, -1)
163+
createTestTask('luskTest_1_21_9', 'Runs tests on Paper 1.21.9.', environments + 'paper-1.21.9.json', java21, -1)
164+
createTestTask('luskTest_1_21_10', 'Runs tests on Paper 1.21.10.', environments + 'paper-1.21.10.json', java21, -1)
161165

162166
tasks.register("luskTestOlderSkriptVersions") {
163167
description = 'Runs tests on older skript versions.'
@@ -166,5 +170,5 @@ tasks.register("luskTestOlderSkriptVersions") {
166170

167171
tasks.register('luskTest') {
168172
description = 'Runs tests on all environments.'
169-
dependsOn luskTestOlderSkriptVersions, luskTest_1_16_5, luskTest_1_17_1, luskTest_1_18_2, luskTest_1_19_4, luskTest_1_20_6, luskTest_1_21_4, luskTest_1_21_5, luskTest_1_21_6, luskTest_1_21_7
173+
dependsOn luskTestOlderSkriptVersions, luskTest_1_16_5, luskTest_1_17_1, luskTest_1_18_2, luskTest_1_19_4, luskTest_1_20_6, luskTest_1_21_4, luskTest_1_21_5, luskTest_1_21_6, luskTest_1_21_7, luskTest_1_21_8, luskTest_1_21_9, luskTest_1_21_10
170174
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name": "paper-1.21.10",
3+
"resources": [
4+
{"source": "server.properties.generic", "target": "server.properties"}
5+
],
6+
"paperDownloads": [
7+
{
8+
"version": "1.21.10",
9+
"target": "paperclip.jar"
10+
}
11+
],
12+
"skriptDownloads": [
13+
{
14+
"version": "2.12.2",
15+
"target": "plugins/Skript.jar"
16+
}
17+
],
18+
"luskTarget": "plugins/Lusk.jar",
19+
"commandLine": [
20+
"-Dcom.mojang.eula.agree=true",
21+
"-jar", "paperclip.jar", "--nogui"
22+
]
23+
}

src/test/environments/paper-1.21.7.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"skriptDownloads": [
1313
{
14-
"version": "2.12.1",
14+
"version": "2.12.2",
1515
"target": "plugins/Skript.jar"
1616
}
1717
],

src/test/environments/paper-1.21.8.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"skriptDownloads": [
1313
{
14-
"version": "2.12.1",
14+
"version": "2.12.2",
1515
"target": "plugins/Skript.jar"
1616
}
1717
],
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name": "paper-1.21.9",
3+
"resources": [
4+
{"source": "server.properties.generic", "target": "server.properties"}
5+
],
6+
"paperDownloads": [
7+
{
8+
"version": "1.21.9",
9+
"target": "paperclip.jar"
10+
}
11+
],
12+
"skriptDownloads": [
13+
{
14+
"version": "2.12.2",
15+
"target": "plugins/Skript.jar"
16+
}
17+
],
18+
"luskTarget": "plugins/Lusk.jar",
19+
"commandLine": [
20+
"-Dcom.mojang.eula.agree=true",
21+
"-jar", "paperclip.jar", "--nogui"
22+
]
23+
}

0 commit comments

Comments
 (0)