From 0169a925efc11158b0c44de7a1888fbbf68bc4d9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 10 May 2022 19:43:47 -0400 Subject: [PATCH] Testing Github Packages --- .github/workflows/deployment.yml | 6 ++++-- .github/workflows/push.yml | 2 ++ build.gradle | 21 ++++++++++++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index c4328bde36..478119830a 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -11,12 +11,14 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 16 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 16 + java-version: 17 - name: Set env run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + - name: Publish package + run: ./gradlew clean publish -PpackageVersion=${RELEASE_VERSION} - name: Add Arc release run: | git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 903cf7435e..1192ece7c0 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -33,5 +33,7 @@ jobs: git commit -m "Automatic bundle update" git push fi + - name: Publish package + run: ./gradlew clean publish -PpackageVersion=${GITHUB_SHA} - name: Run unit tests run: ./gradlew clean cleanTest test --stacktrace diff --git a/build.gradle b/build.gradle index 16127a1a75..356c6d4c93 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ plugins{ allprojects{ apply plugin: 'maven-publish' - version = 'release' + version = project.hasProperty("packageVersion") ? project.getProperty("packageVersion") : 'release' group = 'com.github.Anuken' ext{ @@ -461,16 +461,27 @@ project(":annotations"){ } } -configure([":core", ":desktop", ":server", ":tools"].collect{project(it)}){ +configure([":core", ":server"].collect{project(it)}){ java{ withJavadocJar() withSourcesJar() } publishing{ - publications{ - maven(MavenPublication){ - from components.java + repositories{ + maven{ + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/anuken/mindustry") + credentials{ + username = project.findProperty("gpr.user") ?: "Anuken" + password = project.findProperty("gpr.key") ?: System.getenv("PACKAGE_TOKEN") + } + } + } + + publications { + gpr(MavenPublication) { + from(components.java) } } }