From 609475a3907e0ee771eb437390911b6a5487a1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ribo=CC=81?= Date: Thu, 4 Jul 2024 13:27:35 +0200 Subject: [PATCH] fix: moving apollo to the new package namespace + update ci tasks Signed-off-by: Javier Ribo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Javier RiboĢ --- .github/workflows/pr-title-validation.yml | 2 +- .github/workflows/pull-request.yml | 4 ++-- .github/workflows/release-documentation.yml | 6 +++--- .github/workflows/release.yml | 17 +++++++++++------ apollo/build.gradle.kts | 8 ++++---- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pr-title-validation.yml b/.github/workflows/pr-title-validation.yml index 7f99b3c44..577d875c5 100644 --- a/.github/workflows/pr-title-validation.yml +++ b/.github/workflows/pr-title-validation.yml @@ -11,4 +11,4 @@ jobs: steps: - uses: amannn/action-semantic-pull-request@v5 env: - GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0f2e5fe88..4c411d3d7 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -12,8 +12,8 @@ concurrency: env: JAVA_VERSION: 17 - GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: pull_request: diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index bc549645a..02c127e1e 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -8,8 +8,8 @@ defaults: env: JAVA_VERSION: 17 - GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: workflow_dispatch: @@ -116,5 +116,5 @@ jobs: REPO: self BRANCH: gh-pages # The branch name where you want to push the assets FOLDER: "apollo/build/dokka/html/" # The directory where your assets are generated - GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }} # GitHub will automatically add this - you don't need to bother getting a token + GITHUB_TOKEN: ${{ secrets.IDENTUS_CI }} MESSAGE: "feat(docs): ({sha}) {msg}" # The commit message diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index be5bba770..4772c9812 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,10 +12,11 @@ concurrency: env: JAVA_VERSION: 17 - GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }} - GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }} + GITHUB_ACTOR: "hyperledger-bot" + GITHUB_ACTOR_EMAIL: "hyperledger-bot@hyperledger.org" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - NPM_TOKEN: ${{ secrets.ATALA_NPM_TOKEN }} + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} on: workflow_dispatch: @@ -91,9 +92,12 @@ jobs: - uses: crazy-max/ghaction-import-gpg@v5 id: import_gpg with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - git_user_signingkey: true - git_commit_gpgsign: true + gpg-private-key: ${{ secrets.HYP_BOT_GPG_PRIVATE }} + passphrase: ${{ secrets.HYP_BOT_GPG_PASSWORD }} + git-user-signingkey: true + git-commit-gpgsign: true + git_config_global: true + git_tag_gpgsign: true - name: "Install rust toolchain (Linux)" if: matrix.os-type == 'linux' @@ -108,6 +112,7 @@ jobs: - name: "Release" env: + GITHUB_TOKEN: ${{ secrets.IDENTUS_CI }} GIT_AUTHOR_EMAIL: ${{ steps.import_gpg.outputs.email }} GIT_COMMITTER_EMAIL: ${{ steps.import_gpg.outputs.email }} GIT_AUTHOR_NAME: ${{ steps.import_gpg.outputs.name }} diff --git a/apollo/build.gradle.kts b/apollo/build.gradle.kts index 816aad8fa..9d8f1f312 100644 --- a/apollo/build.gradle.kts +++ b/apollo/build.gradle.kts @@ -797,14 +797,14 @@ tasks.withType().configureEach { } npmPublish { - organization.set("atala") + organization.set("hyperledger") version.set(rootProject.version.toString()) access.set(NpmAccess.PUBLIC) packages { access.set(NpmAccess.PUBLIC) named("js") { - scope.set("atala") - packageName.set("apollo") + scope.set("hyperledger") + packageName.set("identus-apollo") readme.set(rootDir.resolve("README.md")) files { from( @@ -819,7 +819,7 @@ npmPublish { } repository { type.set("git") - url.set("https://github.com/input-output-hk/atala-prism-apollo.git") + url.set("https://github.com/hyperledger/identus-apollo.git") } } }