From 0eb42b53b4bf42e9054da5ef394625c93f63391e Mon Sep 17 00:00:00 2001 From: Takahiro Nakayama Date: Thu, 4 Aug 2022 00:17:01 +0900 Subject: [PATCH 1/5] Publish Github Packages instead of bintray Signed-off-by: Takahiro Nakayama --- build.gradle | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index 02ba542..ae0a747 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,4 @@ plugins { - id "com.jfrog.bintray" version "1.7" id "maven-publish" id "java" id "jacoco" @@ -11,7 +10,6 @@ plugins { repositories { mavenCentral() - jcenter() } configurations { @@ -81,8 +79,18 @@ allprojects { } publishing { + repositories { + maven { + name = "GitHubPackages" + url = "https://maven.pkg.github.com/octocat/hello-world" + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } publications { - mavenPublication(MavenPublication) { + gpr(MavenPublication) { from components.java groupId project.group artifactId project.name @@ -114,35 +122,6 @@ allprojects { } } } - - bintray { - user = project.hasProperty('bintray_user') ? bintray_user : '' - key = project.hasProperty('bintray_apikey') ? bintray_apikey : '' - publish = true // automatic publish - - pkg { - userOrg = 'medjed' - repo = 'maven' - name = project.name - licenses = [project.license] - websiteUrl = project.websiteUrl - issueTrackerUrl = project.issueTrackerUrl - vcsUrl = project.vcsUrl - githubRepo = project.githubRepo - version { - name = project.version - released = new Date() - gpg { - sign = true - passphrase = project.hasProperty('bintray_gpg_password') ? bintray_gpg_password : '' - } - } - } - publications = ['mavenPublication'] - configurations = ['archives'] - -// dryRun = true - } } task classpath(type: Copy, dependsOn: ["jar"]) { @@ -166,6 +145,5 @@ task(commitJavadoc, dependsOn: generateJavadoc) << { } afterReleaseBuild.dependsOn commitJavadoc -afterReleaseBuild.dependsOn bintrayUpload clean { delete "classpath" } From 6a409196e93e178495c3f898229eda9842ac38fe Mon Sep 17 00:00:00 2001 From: Takahiro Nakayama Date: Thu, 4 Aug 2022 00:19:49 +0900 Subject: [PATCH 2/5] Add publishing workflow Signed-off-by: Takahiro Nakayama --- .github/workflows/publish.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..b42dc48 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,24 @@ +name: Publish package to GitHub Packages +on: + release: + types: [created] +jobs: + publish: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'adopt' + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + - name: Publish package + uses: gradle/gradle-build-action@v2 + with: + arguments: publish + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 925e5e8fa9415e7053bbecd7c7a45ab0d1e5a32a Mon Sep 17 00:00:00 2001 From: Takahiro Nakayama Date: Thu, 4 Aug 2022 00:20:49 +0900 Subject: [PATCH 3/5] tmp Signed-off-by: Takahiro Nakayama --- .github/workflows/publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b42dc48..39dacd2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,5 +1,7 @@ name: Publish package to GitHub Packages on: + pull_request: + types: [opened, synchronize] release: types: [created] jobs: From 430c601e73df368052492114b25028cf3613ae34 Mon Sep 17 00:00:00 2001 From: Takahiro Nakayama Date: Thu, 4 Aug 2022 00:31:54 +0900 Subject: [PATCH 4/5] fixup! Publish Github Packages instead of bintray Signed-off-by: Takahiro Nakayama --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ae0a747..4ae7bba 100644 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,7 @@ allprojects { repositories { maven { name = "GitHubPackages" - url = "https://maven.pkg.github.com/octocat/hello-world" + url = "https://maven.pkg.github.com/medjed/JsonPathCompiler" credentials { username = System.getenv("GITHUB_ACTOR") password = System.getenv("GITHUB_TOKEN") From c104e05f43093837015f2f893f63a297d9eeab77 Mon Sep 17 00:00:00 2001 From: Takahiro Nakayama Date: Thu, 4 Aug 2022 00:49:46 +0900 Subject: [PATCH 5/5] Use github-app token Signed-off-by: Takahiro Nakayama --- .github/workflows/publish.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 39dacd2..7c2bce4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,9 +18,14 @@ jobs: distribution: 'adopt' - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 + - id: github-app-token + uses: tibdex/github-app-token@v1 + with: + app_id: ${{ secrets.JSONPATHCOMPILER_GITHUB_APP_APP_ID }} + private_key: ${{ secrets.JSONPATHCOMPILER_GITHUB_APP_PRIVATE_KEY }} - name: Publish package uses: gradle/gradle-build-action@v2 with: arguments: publish env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ steps.github-app-token.outputs.token }}