From 71fcd91c3eed981cc735600b466d6d784f7e85b3 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Wed, 27 Sep 2023 23:09:53 +0200 Subject: [PATCH 1/3] Testing stuff.. --- .github/workflows/build.yml | 19 ++++++++----------- .github/workflows/publish.yml | 19 ++++++++----------- implementations/forge-1.17.1/build.gradle | 4 ++++ 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8021d1cd..27cb3be1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,18 +18,15 @@ jobs: with: submodules: recursive fetch-depth: 0 # needed for versioning - - name: Set up JDK 1.17 - uses: actions/setup-java@v1 + - name: Set up Java + - uses: actions/setup-java@v3 with: - java-version: 17 - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: "${{ runner.os }}-bluemap-${{ hashFiles('**/*.gradle*') }}" - restore-keys: | - ${{ runner.os }}-bluemap- + distribution: 'temurin' + java-version: | + 11 + 16 + 17 + cache: 'gradle' - name: Build with Gradle run: ./gradlew clean spotlessCheck test build - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5fdac2ce..1f25e970 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,18 +11,15 @@ jobs: with: submodules: recursive fetch-depth: 0 # needed for versioning - - name: Set up JDK 1.17 - uses: actions/setup-java@v1 + - name: Set up Java + - uses: actions/setup-java@v3 with: - java-version: 17 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: "${{ runner.os }}-bluemap-${{ hashFiles('**/*.gradle*') }}" - restore-keys: | - ${{ runner.os }}-bluemap- + distribution: 'temurin' + java-version: | + 11 + 16 + 17 + cache: 'gradle' - name: Build with Gradle env: MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} diff --git a/implementations/forge-1.17.1/build.gradle b/implementations/forge-1.17.1/build.gradle index 038bc301..a4a475c3 100644 --- a/implementations/forge-1.17.1/build.gradle +++ b/implementations/forge-1.17.1/build.gradle @@ -29,6 +29,10 @@ def javaTarget = 16 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) + + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } } minecraft { From 4d38a2953de1dc83193964db84f274cc4def5a9a Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Wed, 27 Sep 2023 23:11:23 +0200 Subject: [PATCH 2/3] Testing stuff..2 --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27cb3be1..3cac3079 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: submodules: recursive fetch-depth: 0 # needed for versioning - name: Set up Java - - uses: actions/setup-java@v3 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1f25e970..36aa7872 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,7 +12,7 @@ jobs: submodules: recursive fetch-depth: 0 # needed for versioning - name: Set up Java - - uses: actions/setup-java@v3 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: | From eb258e7c332d1cbbf42d65b1b398785abc6e4363 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Wed, 27 Sep 2023 23:14:46 +0200 Subject: [PATCH 3/3] Testing stuff..3 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cac3079..c58a6fea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,7 @@ on: pull_request: branches: - "*" + workflow_dispatch: jobs: build: