From 4c8e84af48cdb579afd715b9e079ec68fccf7405 Mon Sep 17 00:00:00 2001 From: Cristian G Date: Fri, 1 Dec 2023 11:59:34 -0500 Subject: [PATCH 1/7] fix: remove failing links to unblock dokka documentation generation --- apollo/docs/Base64.md | 12 ------------ apollo/docs/SecureRandom.md | 11 ----------- 2 files changed, 23 deletions(-) diff --git a/apollo/docs/Base64.md b/apollo/docs/Base64.md index 26714ed9d..8e0677541 100644 --- a/apollo/docs/Base64.md +++ b/apollo/docs/Base64.md @@ -1,17 +1,5 @@ # Package io.iohk.atala.prism.apollo.base64 -[![Kotlin](https://img.shields.io/badge/kotlin-1.8.20-blue.svg?logo=kotlin)](http://kotlinlang.org) - -![android](https://camo.githubusercontent.com/b1d9ad56ab51c4ad1417e9a5ad2a8fe63bcc4755e584ec7defef83755c23f923/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d616e64726f69642d3645444238442e7376673f7374796c653d666c6174) -![apple-silicon](https://camo.githubusercontent.com/a92c841ffd377756a144d5723ff04ecec886953d40ac03baa738590514714921/687474703a2f2f696d672e736869656c64732e696f2f62616467652f737570706f72742d2535424170706c6553696c69636f6e2535442d3433424246462e7376673f7374796c653d666c6174) -![ios](https://camo.githubusercontent.com/1fec6f0d044c5e1d73656bfceed9a78fd4121b17e82a2705d2a47f6fd1f0e3e5/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d696f732d4344434443442e7376673f7374796c653d666c6174) -![jvm](https://camo.githubusercontent.com/700f5dcd442fd835875568c038ae5cd53518c80ae5a0cf12c7c5cf4743b5225b/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6a766d2d4442343133442e7376673f7374796c653d666c6174) -![js](https://camo.githubusercontent.com/3e0a143e39915184b54b60a2ecedec75e801f396d34b5b366c94ec3604f7e6bd/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6a732d4638444235442e7376673f7374796c653d666c6174) -![getNode-js](https://camo.githubusercontent.com/d08fda729ceebcae0f23c83499ca8f06105350f037661ac9a4cc7f58edfdbca9/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6e6f64656a732d3638613036332e7376673f7374796c653d666c6174) -![macos](https://camo.githubusercontent.com/1b8313498db244646b38a4480186ae2b25464e5e8d71a1920c52b2be5212b909/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6d61636f732d3131313131312e7376673f7374796c653d666c6174) -![tvos](https://camo.githubusercontent.com/4ac08d7fb1bcb8ef26388cd2bf53b49626e1ab7cbda581162a946dd43e6a2726/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d74766f732d3830383038302e7376673f7374796c653d666c6174) -![watchos](https://camo.githubusercontent.com/135dbadae40f9cabe7a3a040f9380fb485cff36c90909f3c1ae36b81c304426b/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d77617463686f732d4330433043302e7376673f7374796c653d666c6174) - ![Atala Prism Logo](../../images/Logo.png) Apollo Base64 is Kotlin Multiplatform library containing: diff --git a/apollo/docs/SecureRandom.md b/apollo/docs/SecureRandom.md index e7bb5e495..7e629c9ab 100644 --- a/apollo/docs/SecureRandom.md +++ b/apollo/docs/SecureRandom.md @@ -1,16 +1,5 @@ # Package io.iohk.atala.prism.apollo.securerandom -[![Kotlin](https://img.shields.io/badge/kotlin-1.8.20-blue.svg?logo=kotlin)](http://kotlinlang.org) - -![android](https://camo.githubusercontent.com/b1d9ad56ab51c4ad1417e9a5ad2a8fe63bcc4755e584ec7defef83755c23f923/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d616e64726f69642d3645444238442e7376673f7374796c653d666c6174) -![apple-silicon](https://camo.githubusercontent.com/a92c841ffd377756a144d5723ff04ecec886953d40ac03baa738590514714921/687474703a2f2f696d672e736869656c64732e696f2f62616467652f737570706f72742d2535424170706c6553696c69636f6e2535442d3433424246462e7376673f7374796c653d666c6174) -![ios](https://camo.githubusercontent.com/1fec6f0d044c5e1d73656bfceed9a78fd4121b17e82a2705d2a47f6fd1f0e3e5/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d696f732d4344434443442e7376673f7374796c653d666c6174) -![jvm](https://camo.githubusercontent.com/700f5dcd442fd835875568c038ae5cd53518c80ae5a0cf12c7c5cf4743b5225b/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6a766d2d4442343133442e7376673f7374796c653d666c6174) -![js](https://camo.githubusercontent.com/3e0a143e39915184b54b60a2ecedec75e801f396d34b5b366c94ec3604f7e6bd/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6a732d4638444235442e7376673f7374796c653d666c6174) -![getNode-js](https://camo.githubusercontent.com/d08fda729ceebcae0f23c83499ca8f06105350f037661ac9a4cc7f58edfdbca9/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6e6f64656a732d3638613036332e7376673f7374796c653d666c6174) -![macos](https://camo.githubusercontent.com/1b8313498db244646b38a4480186ae2b25464e5e8d71a1920c52b2be5212b909/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6d61636f732d3131313131312e7376673f7374796c653d666c6174) -![tvos](https://camo.githubusercontent.com/4ac08d7fb1bcb8ef26388cd2bf53b49626e1ab7cbda581162a946dd43e6a2726/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d74766f732d3830383038302e7376673f7374796c653d666c6174) -![watchos](https://camo.githubusercontent.com/135dbadae40f9cabe7a3a040f9380fb485cff36c90909f3c1ae36b81c304426b/687474703a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d77617463686f732d4330433043302e7376673f7374796c653d666c6174) ![Atala Prism Logo](../../images/Logo.png) From 85e4225a6b24d88f80be48424eae0dad375e1097 Mon Sep 17 00:00:00 2001 From: Cristian G Date: Fri, 1 Dec 2023 12:16:47 -0500 Subject: [PATCH 2/7] fix: uncomment main for release-documentation to test --- .github/workflows/release-documentation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index 9e30a41bc..e5ff46494 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -15,8 +15,8 @@ env: on: workflow_dispatch: push: - branches: - - main +# branches: +# - main tags: - "*" From 3521abbc1ac462d73636182d7c6b545789d6c129 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Tue, 5 Dec 2023 16:18:50 +0200 Subject: [PATCH 3/7] Update build.gradle.kts Signed-off-by: Ahmed Moussa --- .github/workflows/release-documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index e5ff46494..03977bc97 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -22,7 +22,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - name: "Checkout the repo" uses: actions/checkout@v3 From 9e251dbc04ebf2f9558c48c522739858276e859d Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Tue, 5 Dec 2023 16:35:12 +0200 Subject: [PATCH 4/7] Update build.gradle.kts Signed-off-by: Ahmed Moussa --- .github/workflows/release-documentation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index 03977bc97..451aab3c5 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -26,6 +26,8 @@ jobs: steps: - name: "Checkout the repo" uses: actions/checkout@v3 + with: + submodules: recursive - name: "Validate Gradle Wrapper" uses: gradle/wrapper-validation-action@v1 From b6e9259dc7ad34c44cdf79f14153179fb1fb222a Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Tue, 5 Dec 2023 21:05:14 +0200 Subject: [PATCH 5/7] Update build.gradle.kts Signed-off-by: Ahmed Moussa --- .github/workflows/release-documentation.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index 451aab3c5..9e4751f3e 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -49,6 +49,16 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: "zulu" + - name: Install Homebrew + if: matrix.os-type == 'macos' + run: | + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + + - name: Install autoconf, automake, libtool + if: matrix.os-type == 'macos' + run: | + brew install autoconf automake libtool + - name: "Dokka Documentation Generation" run: | ./gradlew dokkaHtml From b45c72ce5d7c42f1ac2ca7b9ae089540a62aa955 Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Tue, 5 Dec 2023 21:28:45 +0200 Subject: [PATCH 6/7] Update build.gradle.kts Signed-off-by: Ahmed Moussa --- .github/workflows/release-documentation.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index 9e4751f3e..6d98a54fd 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -50,12 +50,10 @@ jobs: distribution: "zulu" - name: Install Homebrew - if: matrix.os-type == 'macos' run: | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - name: Install autoconf, automake, libtool - if: matrix.os-type == 'macos' run: | brew install autoconf automake libtool From 8e6925d12b03470bb6dce9f7475f41c2347d5cfa Mon Sep 17 00:00:00 2001 From: Ahmed Moussa Date: Tue, 5 Dec 2023 21:55:32 +0200 Subject: [PATCH 7/7] build: CI scripts Signed-off-by: Ahmed Moussa --- .github/workflows/Deployment.yml | 6 ++--- .github/workflows/pull-request.yml | 28 +++++++++++---------- .github/workflows/release-documentation.yml | 12 ++++----- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/Deployment.yml b/.github/workflows/Deployment.yml index c698559bb..66ea6cadb 100644 --- a/.github/workflows/Deployment.yml +++ b/.github/workflows/Deployment.yml @@ -26,7 +26,7 @@ jobs: release: runs-on: macos-latest steps: - - name: Checkout the repo + - name: "Checkout the repo" uses: actions/checkout@v3 with: submodules: recursive @@ -44,7 +44,7 @@ jobs: with: node-version: "lts/*" - - name: Install Homebrew + - name: "Install Homebrew" run: > /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" @@ -60,7 +60,7 @@ jobs: git_user_signingkey: true git_commit_gpgsign: true - - name: Release + - name: "Release" env: GIT_AUTHOR_EMAIL: ${{ steps.import_gpg.outputs.email }} GIT_COMMITTER_EMAIL: ${{ steps.import_gpg.outputs.email }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 79cbe54ee..94816f385 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -30,54 +30,56 @@ jobs: fail-fast: false runs-on: ${{ matrix.os }} steps: - - name: Validate Gradle Wrapper + - name: "Validate Gradle Wrapper" run: pwd - - name: Checkout the repo + - name: "Checkout the repo" uses: actions/checkout@v3 with: submodules: recursive + token: ${{ secrets.ATALA_GITHUB_TOKEN }} + fetch-depth: 0 - - name: Install Java ${{ env.JAVA_VERSION }} + - name: "Install Java ${{ env.JAVA_VERSION }}" uses: actions/setup-java@v3 with: java-version: ${{ env.JAVA_VERSION }} distribution: "zulu" - - name: Gradle Build Action + - name: "Gradle Build Action" uses: gradle/gradle-build-action@v2 - - name: Install NodeJS ${{ env.NODEJS_VERSION }} + - name: "Install NodeJS ${{ env.NODEJS_VERSION }}" uses: actions/setup-node@v3 with: node-version: ${{ env.NODEJS_VERSION }} - - name: Install Homebrew + - name: "Install Homebrew" if: matrix.os-type == 'macos' run: | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - - name: Install autoconf, automake, libtool + - name: "Install autoconf, automake, libtool" if: matrix.os-type == 'macos' run: | brew install autoconf automake libtool - - name: Test Kotlin code is properly formatted + - name: "Test Kotlin code is properly formatted" run: ./gradlew ktlintCheck - - name: Build Check All tests + - name: "Build Check All tests" run: ./gradlew allTests - - name: Generate kover coverage report + - name: "Generate kover coverage report" run: ./gradlew koverHtmlReport koverXmlReport - - name: Upload coverage html + - name: "Upload coverage html" uses: actions/upload-artifact@v3.1.2 with: name: coverage-results-${{ matrix.os-type }}.zip path: build/reports/kover/html - - name: Add coverage report to PR + - name: "Add coverage report to PR" id: kover uses: mi-kas/kover-report@v1 with: @@ -89,7 +91,7 @@ jobs: min-coverage-changed-files: 90 coverage-counter-type: LINE - - name: Upload the build report + - name: "Upload the build report" if: always() uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/release-documentation.yml b/.github/workflows/release-documentation.yml index 6d98a54fd..3e03d1fe8 100644 --- a/.github/workflows/release-documentation.yml +++ b/.github/workflows/release-documentation.yml @@ -15,10 +15,8 @@ env: on: workflow_dispatch: push: -# branches: -# - main - tags: - - "*" + branches: + - main jobs: build: @@ -28,6 +26,8 @@ jobs: uses: actions/checkout@v3 with: submodules: recursive + token: ${{ secrets.ATALA_GITHUB_TOKEN }} + fetch-depth: 0 - name: "Validate Gradle Wrapper" uses: gradle/wrapper-validation-action@v1 @@ -49,11 +49,11 @@ jobs: java-version: ${{ env.JAVA_VERSION }} distribution: "zulu" - - name: Install Homebrew + - name: "Install Homebrew" run: | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - - name: Install autoconf, automake, libtool + - name: "Install autoconf, automake, libtool" run: | brew install autoconf automake libtool