Skip to content

Commit

Permalink
fix: move to hyperledger and update ci tasks (#176)
Browse files Browse the repository at this point in the history
Signed-off-by: Javier Ribó <[email protected]>
  • Loading branch information
elribonazo authored Jul 8, 2024
1 parent 3b3e604 commit c641673
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence
* @elribonazo @hamada147 @goncalo-frade-iohk @yshyn-iohk @curtis-h @cristianIOHK @amagyar-iohk
* @elribonazo @goncalo-frade-iohk @yshyn-iohk @curtis-h @cristianIOHK @amagyar-iohk

# Docs:
*.md @petevielhaber
2 changes: 1 addition & 1 deletion .github/workflows/pr-title-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
17 changes: 11 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "[email protected]"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
NPM_TOKEN: ${{ secrets.ATALA_NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

on:
workflow_dispatch:
Expand Down Expand Up @@ -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'
Expand All @@ -108,6 +112,7 @@ jobs:

- name: "Release"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GIT_AUTHOR_EMAIL: ${{ steps.import_gpg.outputs.email }}
GIT_COMMITTER_EMAIL: ${{ steps.import_gpg.outputs.email }}
GIT_AUTHOR_NAME: ${{ steps.import_gpg.outputs.name }}
Expand Down
8 changes: 4 additions & 4 deletions apollo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -797,14 +797,14 @@ tasks.withType<DokkaTask>().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(
Expand All @@ -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")
}
}
}
Expand Down
21 changes: 12 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import java.util.Base64

val publishedMavenId: String = "io.iohk.atala.prism.apollo"
val publishedMavenId: String = "org.hyperledger.identus.apollo"

plugins {
id("org.jetbrains.dokka") version "1.9.20"
Expand Down Expand Up @@ -33,6 +31,14 @@ allprojects {
google()
mavenCentral()
maven { url = uri("https://jitpack.io") }
maven {
name = "OSSRH"
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
credentials {
username = project.findProperty("ossrhUsername") as String? ?: System.getenv("OSSRH_USERNAME")
password = project.findProperty("ossrhToken") as String? ?: System.getenv("OSSRH_TOKEN")
}
}
}

apply(plugin = "org.gradle.maven-publish")
Expand Down Expand Up @@ -123,14 +129,11 @@ allprojects {
url.set("https://github.com/input-output-hk/atala-prism-apollo")
}
}

signing {
val base64EncodedAsciiArmoredSigningKey: String = System.getenv("BASE64_ARMORED_GPG_SIGNING_KEY_MAVEN") ?: ""
val signingKeyPassword: String = System.getenv("SIGNING_KEY_PASSWORD") ?: ""
useInMemoryPgpKeys(
String(
Base64.getDecoder().decode(base64EncodedAsciiArmoredSigningKey.toByteArray())
),
signingKeyPassword
project.findProperty("signing.signingSecretKey") as String? ?: System.getenv("SIGNING_SECRET_KEY"),
project.findProperty("signing.signingSecretKeyPassword") as String? ?: System.getenv("SIGNING_SECRET_KEY_PASSWORD")
)
sign(this@withType)
}
Expand Down

0 comments on commit c641673

Please sign in to comment.