From 107b4f70029e89873e7b3d1901c0d4528db36291 Mon Sep 17 00:00:00 2001 From: Wyvest <45589059+Wyvest@users.noreply.github.com> Date: Sat, 6 Aug 2022 20:24:17 +0900 Subject: fix ci (#82) * Update release.yml * maybe fix ci? --- .github/workflows/release.yml | 2 +- settings.gradle.kts | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3bef8b3..4defbcc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,7 @@ jobs: id: version - name: Publish - run: ./gradlew platform:publishAllPublicationsToReleasesRepository -Pmod_minor_version=${{ steps.version.outputs.VERSION_NUMBER }} -PreleasesUsername=${{ secrets.MAVEN_NAME }} -PreleasesPassword=${{ secrets.MAVEN_TOKEN }} --no-daemon + run: ./gradlew publish -Pmod_minor_version=${{ steps.version.outputs.VERSION_NUMBER }} -PreleasesUsername=${{ secrets.MAVEN_NAME }} -PreleasesPassword=${{ secrets.MAVEN_TOKEN }} -DBUILDING_CI=true --no-daemon - name: Upload Build Artifacts uses: actions/upload-artifact@v2 diff --git a/settings.gradle.kts b/settings.gradle.kts index e5fe21b..b2d3b25 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,12 +23,16 @@ pluginManagement { val mod_name: String by settings +val buildingCi = System.getProperty("BUILDING_CI") == "true" + rootProject.name = mod_name -include(":lwjgl") -project(":lwjgl").apply { - projectDir = file("lwjgl/") - buildFileName = "root.gradle.kts" +if (!buildingCi) { + include(":lwjgl") + project(":lwjgl").apply { + projectDir = file("lwjgl/") + buildFileName = "root.gradle.kts" + } } include(":platform") @@ -44,13 +48,15 @@ listOf( "1.16.2-fabric" ).forEach { version -> include(":platform:$version") - include(":lwjgl:$version") project(":platform:$version").apply { projectDir = file("versions/$version") buildFileName = "../build.gradle.kts" } - project(":lwjgl:$version").apply { - projectDir = file("lwjgl/$version") - buildFileName = "../build.gradle.kts" + if (!buildingCi) { + include(":lwjgl:$version") + project(":lwjgl:$version").apply { + projectDir = file("lwjgl/$version") + buildFileName = "../build.gradle.kts" + } } } -- cgit