From fc81c70492d769512085f17227acb191350865b8 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:14:57 +0400 Subject: [PATCH 01/12] use gh packages test --- .github/workflows/build.yml | 9 +++++++++ build.gradle.kts | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41d89088..17991b2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,3 +60,12 @@ jobs: tag_name: ${{ env.SPP_PROTOCOL_VERSION }} release_name: v${{ env.SPP_PROTOCOL_VERSION }} draft: true + + - name: Remove Old Snapshot Package +# if: github.ref == 'refs/heads/master' + uses: smartsquaregmbh/delete-old-packages@v0.4.0 + with: + version-pattern: "^\\d+\\.\\d+\\.\\d+-SNAPSHOT$" # The regex needs to be escaped! + names: | + spp.protocol.protocol + spp.protocol.protocol-jvm diff --git a/build.gradle.kts b/build.gradle.kts index 85b0eb82..8652d126 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,14 @@ repositories { configure { repositories { - maven("file://${System.getenv("HOME")}/.m2/repository") + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/sourceplusplus/protocol") + credentials { + username = (project.findProperty("gpr.user") ?: System.getenv("USERNAME"))?.toString() + password = (project.findProperty("gpr.key") ?: System.getenv("TOKEN"))?.toString() + } + } } } From 881848314c134a4192b390e49725419869d2c7df Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:25:40 +0400 Subject: [PATCH 02/12] keep 0 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17991b2f..82b131e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,6 +65,7 @@ jobs: # if: github.ref == 'refs/heads/master' uses: smartsquaregmbh/delete-old-packages@v0.4.0 with: + keep: 0 version-pattern: "^\\d+\\.\\d+\\.\\d+-SNAPSHOT$" # The regex needs to be escaped! names: | spp.protocol.protocol From 4c5be48bcb63f8d7cdc4752800ee23ab86a93fbe Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:29:57 +0400 Subject: [PATCH 03/12] keep 0 --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82b131e5..adcd53a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,6 +67,7 @@ jobs: with: keep: 0 version-pattern: "^\\d+\\.\\d+\\.\\d+-SNAPSHOT$" # The regex needs to be escaped! - names: | - spp.protocol.protocol - spp.protocol.protocol-jvm + names: + - 'spp.protocol.protocol' + - 'spp.protocol.protocol-jvm' + - 'spp.protocol.protocol-js' From a9dd27078b4aefa35e3e9503edb440659cd1b11c Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:33:20 +0400 Subject: [PATCH 04/12] keep 0 --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index adcd53a6..a2d6c439 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,8 +66,8 @@ jobs: uses: smartsquaregmbh/delete-old-packages@v0.4.0 with: keep: 0 - version-pattern: "^\\d+\\.\\d+\\.\\d+-SNAPSHOT$" # The regex needs to be escaped! - names: - - 'spp.protocol.protocol' - - 'spp.protocol.protocol-jvm' - - 'spp.protocol.protocol-js' + version-pattern: "^\\d+\\.\\d+\\.\\d+-SNAPSHOT$" + names: | + spp.protocol.protocol + spp.protocol.protocol-jvm + spp.protocol.protocol-js From d6a8c8fe7a2cc87ba046ff4f4843ab0ed8a14489 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:38:26 +0400 Subject: [PATCH 05/12] publish --- .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 a2d6c439..03902543 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,8 +61,8 @@ jobs: release_name: v${{ env.SPP_PROTOCOL_VERSION }} draft: true - - name: Remove Old Snapshot Package -# if: github.ref == 'refs/heads/master' + - name: Remove Old Snapshot Packages + if: github.ref == 'refs/heads/master' uses: smartsquaregmbh/delete-old-packages@v0.4.0 with: keep: 0 @@ -71,3 +71,7 @@ jobs: spp.protocol.protocol spp.protocol.protocol-jvm spp.protocol.protocol-js + + - name: Publish New Snapshot Package +# if: github.ref == 'refs/heads/master' + run: ./gradlew publish From 1056430236d46100e85b62502966c0a91e1ebeb5 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:39:00 +0400 Subject: [PATCH 06/12] publish --- .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 03902543..b7b7fad7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,4 +74,4 @@ jobs: - name: Publish New Snapshot Package # if: github.ref == 'refs/heads/master' - run: ./gradlew publish + run: ./gradlew publish From 6282db8429e8cbc18c5270afbf6b51bafcc19efa Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:40:34 +0400 Subject: [PATCH 07/12] publish --- .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 b7b7fad7..14aee8d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,6 +72,6 @@ jobs: spp.protocol.protocol-jvm spp.protocol.protocol-js - - name: Publish New Snapshot Package + - name: Publish New Snapshot Package # if: github.ref == 'refs/heads/master' - run: ./gradlew publish + run: ./gradlew publish From 8823d28e0d180cce13e1152953acbf058a5dac70 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:51:49 +0400 Subject: [PATCH 08/12] publish --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8652d126..1704612d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,8 +26,8 @@ configure { name = "GitHubPackages" url = uri("https://maven.pkg.github.com/sourceplusplus/protocol") credentials { - username = (project.findProperty("gpr.user") ?: System.getenv("USERNAME"))?.toString() - password = (project.findProperty("gpr.key") ?: System.getenv("TOKEN"))?.toString() + username = System.getenv("GH_PUBLISH_USERNAME")?.toString() + password = System.getenv("GH_PUBLISH_TOKEN")?.toString() } } } From 46013445a135d8ece8f402054dd036fdbece16e7 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:55:53 +0400 Subject: [PATCH 09/12] publish --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14aee8d0..2cc98a98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,3 +75,6 @@ jobs: - name: Publish New Snapshot Package # if: github.ref == 'refs/heads/master' run: ./gradlew publish + env: + GH_PUBLISH_USERNAME: ${{ secrets.GH_PUBLISH_USERNAME }} + GH_PUBLISH_TOKEN: ${{ secrets.GH_PUBLISH_TOKEN }} From f19a2105f4abecff3f09a8e338284adcae5126af Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 18:59:58 +0400 Subject: [PATCH 10/12] publish --- .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 2cc98a98..2a315c64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,5 +76,5 @@ jobs: # if: github.ref == 'refs/heads/master' run: ./gradlew publish env: - GH_PUBLISH_USERNAME: ${{ secrets.GH_PUBLISH_USERNAME }} - GH_PUBLISH_TOKEN: ${{ secrets.GH_PUBLISH_TOKEN }} + GH_PUBLISH_USERNAME: $GITHUB_ACTOR + GH_PUBLISH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f3c64fb3309ec10f313636e059b74760250ff27c Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 19:04:39 +0400 Subject: [PATCH 11/12] publish --- .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 2a315c64..4b1ae8ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,7 @@ jobs: spp.protocol.protocol-js - name: Publish New Snapshot Package -# if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master' run: ./gradlew publish env: GH_PUBLISH_USERNAME: $GITHUB_ACTOR From 02414073db553c7292914c9213bf74302189f876 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 25 May 2022 19:05:59 +0400 Subject: [PATCH 12/12] Update build.yml --- .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 4b1ae8ae..60d5b895 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: spp.protocol.protocol-jvm spp.protocol.protocol-js - - name: Publish New Snapshot Package + - name: Publish New Snapshot Packages if: github.ref == 'refs/heads/master' run: ./gradlew publish env: