From 2c2c7944c933caee0842110ef77d0340cd063852 Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Fri, 15 Mar 2024 23:45:07 -0500 Subject: [PATCH 01/10] Add build/test workflow --- .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..1ae261ae --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,40 @@ +name: Build and test + +on: + - push + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + - name: Upload artifacts + uses: actions/upload-artifact@master + with: + path: build/libs/*.jar + test: + runs-on: ubuntu-latest + needs: [build] + steps: + - name: Checkout repo + uses: actions/checkout@v2 + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + path: extra-plugins/ + merge-multiple: true + - name: Run tests + uses: SkriptLang/skript-test-action@v1.0 + with: + test_script_directory: src/test/scripts + skript_repo_ref: dev/patch + extra_plugins_directory: extra-plugins/ From b862f9036f65c6aec1cb7729a179108389dabfff Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Fri, 15 Mar 2024 23:53:59 -0500 Subject: [PATCH 02/10] Add first test --- .github/workflows/build.yml | 9 +++++---- src/main/test/scripts/conditions/CondCanBeEnchanted.sk | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/main/test/scripts/conditions/CondCanBeEnchanted.sk diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ae261ae..f0688bd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,16 +9,17 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - name: Set up JDK + uses: actions/setup-java@v2 with: - java-version: 1.8 + java-version: 17 + distribution: 'adopt' - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build - name: Upload artifacts - uses: actions/upload-artifact@master + uses: actions/upload-artifact@v4 with: path: build/libs/*.jar test: diff --git a/src/main/test/scripts/conditions/CondCanBeEnchanted.sk b/src/main/test/scripts/conditions/CondCanBeEnchanted.sk new file mode 100644 index 00000000..d67bbad6 --- /dev/null +++ b/src/main/test/scripts/conditions/CondCanBeEnchanted.sk @@ -0,0 +1,4 @@ +test "CondCanBeEnchanted": + assert dirt can't be enchanted with sharpness with "dirt can't be enchanted with sharpness" + assert diamond sword can be enchanted with sharpness with "a diamond sword can be enchanted with sharpness" + \ No newline at end of file From ea7c8976aabe9593594e5ba6815a884f9c274a8f Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Fri, 15 Mar 2024 23:55:01 -0500 Subject: [PATCH 03/10] Switch gradle workflow --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0688bd1..29732235 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,8 @@ jobs: with: java-version: 17 distribution: 'adopt' - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - name: Setup Gradle + uses: gradle/gradle-build-action@v3 - name: Build with Gradle run: ./gradlew build - name: Upload artifacts From ec83a80d546e43747bff22f6cfac09ba18a30369 Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Fri, 15 Mar 2024 23:56:17 -0500 Subject: [PATCH 04/10] Make gradle executable --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29732235..263ecdcb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,8 @@ jobs: distribution: 'adopt' - name: Setup Gradle uses: gradle/gradle-build-action@v3 + - name: Grant execute permission for gradlew + run: chmod +x gradlew - name: Build with Gradle run: ./gradlew build - name: Upload artifacts From 7021d5b66ee5def34816bd1e9b8084e0f1b93071 Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Sat, 16 Mar 2024 00:01:05 -0500 Subject: [PATCH 05/10] Try new Gradle setup --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 263ecdcb..a9605235 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,12 @@ jobs: with: java-version: 17 distribution: 'adopt' - - name: Setup Gradle - uses: gradle/gradle-build-action@v3 + - name: Install SDKMan + run: curl -s "https://get.sdkman.io" | bash + - name: Install Gradle + run: sdk install gradle 8.6 + - name: Generate Gradle wrapper + run: gradle wrapper - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle From 7d08af0344534eef6a5e686641e3df1e4e80baaf Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Sat, 16 Mar 2024 00:02:33 -0500 Subject: [PATCH 06/10] Add initialize SDKMan step --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9605235..38f7aa2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,8 @@ jobs: distribution: 'adopt' - name: Install SDKMan run: curl -s "https://get.sdkman.io" | bash + - name: Initialize SDKMan + run: source "/home/runner/.sdkman/bin/sdkman-init.sh" - name: Install Gradle run: sdk install gradle 8.6 - name: Generate Gradle wrapper From f8e7695c137fd81a7b702899d49d517435606ec3 Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Sat, 16 Mar 2024 00:04:43 -0500 Subject: [PATCH 07/10] Let somebody else handle installing gradle --- .github/workflows/build.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38f7aa2c..38dba46c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,12 +14,11 @@ jobs: with: java-version: 17 distribution: 'adopt' - - name: Install SDKMan - run: curl -s "https://get.sdkman.io" | bash - - name: Initialize SDKMan - run: source "/home/runner/.sdkman/bin/sdkman-init.sh" - - name: Install Gradle - run: sdk install gradle 8.6 + - name: Install gradle + uses: sdkman/sdkman-action@v1 + with: + candidate: gradle + version: 8.6 - name: Generate Gradle wrapper run: gradle wrapper - name: Grant execute permission for gradlew From 41a4fb8f66a09ff507cc565d741fb22d6b173510 Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Sat, 16 Mar 2024 00:05:44 -0500 Subject: [PATCH 08/10] More gradle install fixes --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38dba46c..07bcaff3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: java-version: 17 distribution: 'adopt' - name: Install gradle - uses: sdkman/sdkman-action@v1 + uses: sdkman/sdkman-action@main with: candidate: gradle version: 8.6 From 9230874ba512c67ae0a7329c70b1d80fac293f43 Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Sat, 16 Mar 2024 00:10:24 -0500 Subject: [PATCH 09/10] Fix directory structure --- .github/workflows/build.yml | 1 + src/{main => }/test/scripts/conditions/CondCanBeEnchanted.sk | 0 2 files changed, 1 insertion(+) rename src/{main => }/test/scripts/conditions/CondCanBeEnchanted.sk (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07bcaff3..ce7a8467 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: + name: Lusk.jar path: build/libs/*.jar test: runs-on: ubuntu-latest diff --git a/src/main/test/scripts/conditions/CondCanBeEnchanted.sk b/src/test/scripts/conditions/CondCanBeEnchanted.sk similarity index 100% rename from src/main/test/scripts/conditions/CondCanBeEnchanted.sk rename to src/test/scripts/conditions/CondCanBeEnchanted.sk From b6ee0df1bd86e6963c892cf21065599b65fe94bd Mon Sep 17 00:00:00 2001 From: Pikachu920 <28607612+Pikachu920@users.noreply.github.com> Date: Sat, 16 Mar 2024 00:11:33 -0500 Subject: [PATCH 10/10] Capitalize install job name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce7a8467..84570373 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: with: java-version: 17 distribution: 'adopt' - - name: Install gradle + - name: Install Gradle uses: sdkman/sdkman-action@main with: candidate: gradle