From ea250103e3c660c64fe9876d23072df589ecfcff Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Mon, 29 Apr 2024 16:42:45 +0800 Subject: [PATCH 1/5] ci: removed coding maven package hosting --- devkit-core/build.gradle.kts | 9 --------- devkit-utils/build.gradle.kts | 9 --------- guid/build.gradle.kts | 9 --------- property-guard-spring-boot-starter/build.gradle.kts | 9 --------- simple-jwt-authzero/build.gradle.kts | 9 --------- simple-jwt-facade/build.gradle.kts | 9 --------- simple-jwt-jjwt/build.gradle.kts | 9 --------- simple-jwt-spring-boot-starter/build.gradle.kts | 9 --------- webcal/build.gradle.kts | 9 --------- 9 files changed, 81 deletions(-) diff --git a/devkit-core/build.gradle.kts b/devkit-core/build.gradle.kts index 7eee4fb..d52dd31 100644 --- a/devkit-core/build.gradle.kts +++ b/devkit-core/build.gradle.kts @@ -90,15 +90,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) diff --git a/devkit-utils/build.gradle.kts b/devkit-utils/build.gradle.kts index 2f37818..d8359e3 100644 --- a/devkit-utils/build.gradle.kts +++ b/devkit-utils/build.gradle.kts @@ -94,15 +94,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) diff --git a/guid/build.gradle.kts b/guid/build.gradle.kts index 4d3da40..a55431f 100644 --- a/guid/build.gradle.kts +++ b/guid/build.gradle.kts @@ -94,15 +94,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) diff --git a/property-guard-spring-boot-starter/build.gradle.kts b/property-guard-spring-boot-starter/build.gradle.kts index 51255f0..74b8bda 100644 --- a/property-guard-spring-boot-starter/build.gradle.kts +++ b/property-guard-spring-boot-starter/build.gradle.kts @@ -100,15 +100,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) diff --git a/simple-jwt-authzero/build.gradle.kts b/simple-jwt-authzero/build.gradle.kts index f4a1a94..4cdcec4 100644 --- a/simple-jwt-authzero/build.gradle.kts +++ b/simple-jwt-authzero/build.gradle.kts @@ -101,15 +101,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) diff --git a/simple-jwt-facade/build.gradle.kts b/simple-jwt-facade/build.gradle.kts index ff57ac4..27d4fcb 100644 --- a/simple-jwt-facade/build.gradle.kts +++ b/simple-jwt-facade/build.gradle.kts @@ -96,15 +96,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) diff --git a/simple-jwt-jjwt/build.gradle.kts b/simple-jwt-jjwt/build.gradle.kts index e2862cf..7b72ee3 100644 --- a/simple-jwt-jjwt/build.gradle.kts +++ b/simple-jwt-jjwt/build.gradle.kts @@ -103,15 +103,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) diff --git a/simple-jwt-spring-boot-starter/build.gradle.kts b/simple-jwt-spring-boot-starter/build.gradle.kts index 6464090..0130bbb 100644 --- a/simple-jwt-spring-boot-starter/build.gradle.kts +++ b/simple-jwt-spring-boot-starter/build.gradle.kts @@ -109,15 +109,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) diff --git a/webcal/build.gradle.kts b/webcal/build.gradle.kts index 176c533..a56b746 100644 --- a/webcal/build.gradle.kts +++ b/webcal/build.gradle.kts @@ -77,15 +77,6 @@ publishing { } } - maven { - name = "codingNexus" - url = URI(providers.gradleProperty("repo.coding.host").get()) - credentials { - username = providers.gradleProperty("repo.coding.username").get() - password = providers.gradleProperty("repo.coding.password").get() - } - } - maven { name = "githubPackages" url = URI(providers.gradleProperty("repo.github.host").get()) From 6596291f3d2b6147b01beb482c0215da517dbf3d Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Mon, 29 Apr 2024 16:50:48 +0800 Subject: [PATCH 2/5] ci: fix ci configurations --- .github/workflows/github-packages-publish.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/github-packages-publish.yml b/.github/workflows/github-packages-publish.yml index 3ff4dcc..846511d 100644 --- a/.github/workflows/github-packages-publish.yml +++ b/.github/workflows/github-packages-publish.yml @@ -37,13 +37,10 @@ jobs: run: echo ${{ secrets.GPG_PASSPHRASE }} | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --export-secret-keys -o gpg_key.ring - name: Restore gradle.properties - env: - GRADLE_PROPERTIES: ${{ secrets.GRADLE_PROPERTIES }} - shell: bash run: | mkdir -p ~/.gradle/ export GRADLE_USER_HOME=~/.gradle - echo ${GRADLE_PROPERTIES} > ~/.gradle/gradle.properties + echo ${{ secrets.GRADLE_PROPERTIES }} > ~/.gradle/gradle.properties - name: Set up JDK 17 uses: actions/setup-java@v4 From cafcbd1a0fe812fc799a7a3f582c198843d560b3 Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Mon, 29 Apr 2024 16:56:33 +0800 Subject: [PATCH 3/5] ci: fix ci configurations --- .github/workflows/github-packages-publish.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-packages-publish.yml b/.github/workflows/github-packages-publish.yml index 846511d..e61eef0 100644 --- a/.github/workflows/github-packages-publish.yml +++ b/.github/workflows/github-packages-publish.yml @@ -37,10 +37,13 @@ jobs: run: echo ${{ secrets.GPG_PASSPHRASE }} | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --export-secret-keys -o gpg_key.ring - name: Restore gradle.properties + env: + GRADLE_PROPERTIES: ${{ secrets.GRADLE_PROPERTIES }} + shell: bash run: | mkdir -p ~/.gradle/ - export GRADLE_USER_HOME=~/.gradle - echo ${{ secrets.GRADLE_PROPERTIES }} > ~/.gradle/gradle.properties + echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV + echo "${GRADLE_PROPERTIES}" > ~/.gradle/gradle.properties - name: Set up JDK 17 uses: actions/setup-java@v4 From 4718cac73e20077c78ea0f1fa5ffedb544df0a5f Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Mon, 29 Apr 2024 17:28:54 +0800 Subject: [PATCH 4/5] ci: fix ci configurations --- .github/workflows/github-packages-publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-packages-publish.yml b/.github/workflows/github-packages-publish.yml index e61eef0..015cb09 100644 --- a/.github/workflows/github-packages-publish.yml +++ b/.github/workflows/github-packages-publish.yml @@ -44,6 +44,7 @@ jobs: mkdir -p ~/.gradle/ echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV echo "${GRADLE_PROPERTIES}" > ~/.gradle/gradle.properties + cat ~/.gradle/gradle.properties - name: Set up JDK 17 uses: actions/setup-java@v4 From edd9da2925e231bc997c836be6ff8b884941a065 Mon Sep 17 00:00:00 2001 From: Zihlu Wang Date: Mon, 29 Apr 2024 17:32:17 +0800 Subject: [PATCH 5/5] ci: fix ci configurations --- .github/workflows/github-packages-publish.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-packages-publish.yml b/.github/workflows/github-packages-publish.yml index 015cb09..5d42e86 100644 --- a/.github/workflows/github-packages-publish.yml +++ b/.github/workflows/github-packages-publish.yml @@ -44,7 +44,9 @@ jobs: mkdir -p ~/.gradle/ echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV echo "${GRADLE_PROPERTIES}" > ~/.gradle/gradle.properties - cat ~/.gradle/gradle.properties + + - name: Check gradle.properties + run: cat ~/.gradle/gradle.properties - name: Set up JDK 17 uses: actions/setup-java@v4