From 7d6942a5dc423c8b0f268ab9a60d79defb4e16b3 Mon Sep 17 00:00:00 2001 From: Matthieu S Date: Sat, 19 Oct 2024 19:52:46 +0200 Subject: [PATCH 1/5] ci: update and delete build cache --- .github/workflows/ci.yaml | 65 ++++++++++++++++++-------------------- ci/build-cache.init.gradle | 17 ---------- 2 files changed, 30 insertions(+), 52 deletions(-) delete mode 100644 ci/build-cache.init.gradle diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c2778d6d..44ad10a8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,33 +7,28 @@ on: pull_request: types: [opened, synchronize, reopened] -env: - BUILD_CACHE_URL: ${{ secrets.BUILD_CACHE_URL }} - BUILD_CACHE_USERNAME: ${{ secrets.BUILD_CACHE_USERNAME }} - BUILD_CACHE_PASSWORD: ${{ secrets.BUILD_CACHE_PASSWORD }} - jobs: validate-wrapper: name: "Validate Gradle wrapper" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/actions/wrapper-validation@v4 check: name: "Run tests & checks" runs-on: ubuntu-latest needs: [validate-wrapper] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: "temurin" java-version: "11" # Required for PrismaKT tests (which call npx prisma) - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 16 @@ -42,10 +37,10 @@ jobs: # from concurrent installations of Prisma, this attempts to fix it. - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v4 - name: Run checks and tests - run: ./gradlew check --build-cache -I ci/build-cache.init.gradle + run: ./gradlew check - name: Upload code coverage to CodeCov uses: codecov/codecov-action@v3 @@ -58,15 +53,15 @@ jobs: runs-on: ubuntu-latest needs: [validate-wrapper] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: "temurin" java-version: "11" - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v4 - name: Publish catalog to local Maven repo run: "./gradlew :tegral-catalog:publishToMavenLocal --build-cache -I ci/build-cache.init.gradle" @@ -83,15 +78,15 @@ jobs: runs-on: ubuntu-latest needs: [validate-wrapper] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: "temurin" java-version: "11" - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v4 - name: Generate Dokka documentation run: ./gradlew :website:rewriteDokkaLinks --build-cache -I ci/build-cache.init.gradle @@ -101,20 +96,20 @@ jobs: needs: [validate-wrapper] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v4 with: version: 7 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - cache: 'pnpm' - cache-dependency-path: '**/pnpm-lock.yaml' + cache: "pnpm" + cache-dependency-path: "**/pnpm-lock.yaml" - name: Install dependencies run: | cd docs && pnpm i --frozen-lockfile - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v4 - name: Build documentation website run: ./gradlew :docs:docusaurusBuild --build-cache -I ci/build-cache.init.gradle @@ -124,24 +119,24 @@ jobs: needs: [validate-wrapper, build-docs, build-dokka, check, check-examples] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: "temurin" java-version: "11" - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v4 # TODO maybe unnecessary - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 - name: Assemble website files run: ./gradlew :website:assembleFiles --build-cache -I ci/build-cache.init.gradle - name: Deploy to Netlify - uses: nwtgck/actions-netlify@v2.0.0 + uses: nwtgck/actions-netlify@v3 with: production-deploy: "${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}" publish-dir: "website/build/output" @@ -161,14 +156,14 @@ jobs: runs-on: ubuntu-latest needs: [validate-wrapper, check, check-examples] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: "temurin" java-version: "11" - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v4 - name: Publish snapshot env: @@ -184,14 +179,14 @@ jobs: runs-on: ubuntu-latest needs: [validate-wrapper, check, build-deploy-website] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: "temurin" java-version: "11" - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v4 - name: Publish release env: diff --git a/ci/build-cache.init.gradle b/ci/build-cache.init.gradle deleted file mode 100644 index 15e4b276..00000000 --- a/ci/build-cache.init.gradle +++ /dev/null @@ -1,17 +0,0 @@ -def cacheUrl = System.getenv('BUILD_CACHE_URL') -def cacheUsername = System.getenv('BUILD_CACHE_USERNAME') -def cachePassword = System.getenv('BUILD_CACHE_PASSWORD') -def isCi = System.getenv().containsKey('CI') - -gradle.settingsEvaluated { settings -> - settings.buildCache { - remote(HttpBuildCache) { - url = cacheUrl - credentials { - username = cacheUsername - password = cachePassword - } - push = isCi - } - } -} From 56d1d041f2b4ef43debb117b5ce57e7cadc2d315 Mon Sep 17 00:00:00 2001 From: Matthieu S Date: Sun, 20 Oct 2024 13:04:19 +0200 Subject: [PATCH 2/5] chore: delete a few more references to the init script --- .github/workflows/ci.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 44ad10a8..a382c354 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -64,13 +64,13 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Publish catalog to local Maven repo - run: "./gradlew :tegral-catalog:publishToMavenLocal --build-cache -I ci/build-cache.init.gradle" + run: "./gradlew :tegral-catalog:publishToMavenLocal" - name: Run check on example run: | examples="step-1 step-2" for example in $examples; do - ./gradlew -p "examples/tutorial/${example}" check --include-build ../../.. --build-cache -I ../../../ci/build-cache.init.gradle + ./gradlew -p "examples/tutorial/${example}" check --include-build ../../.. done build-dokka: @@ -89,7 +89,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Generate Dokka documentation - run: ./gradlew :website:rewriteDokkaLinks --build-cache -I ci/build-cache.init.gradle + run: ./gradlew :website:rewriteDokkaLinks build-docs: name: "Build Docusaurus" @@ -112,7 +112,7 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Build documentation website - run: ./gradlew :docs:docusaurusBuild --build-cache -I ci/build-cache.init.gradle + run: ./gradlew :docs:docusaurusBuild build-deploy-website: name: Assemble and deploy website @@ -133,7 +133,7 @@ jobs: - uses: actions/setup-node@v4 - name: Assemble website files - run: ./gradlew :website:assembleFiles --build-cache -I ci/build-cache.init.gradle + run: ./gradlew :website:assembleFiles - name: Deploy to Netlify uses: nwtgck/actions-netlify@v3 @@ -171,7 +171,7 @@ jobs: ORG_GRADLE_PROJECT_mavenCentralSnapshotsPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} - run: ./gradlew -PpublishSnapshot -Psign publish --build-cache -I ci/build-cache.init.gradle + run: ./gradlew -PpublishSnapshot -Psign publish publish-release: name: Publish release From 94c27cc7631441fd1798c05471409d51080e45f6 Mon Sep 17 00:00:00 2001 From: Matthieu S Date: Sun, 20 Oct 2024 17:13:36 +0200 Subject: [PATCH 3/5] chore: reorganize since build cache isn't a thing anymore --- .github/workflows/ci.yaml | 41 +++------------------------------------ 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a382c354..9efee281 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -73,30 +73,16 @@ jobs: ./gradlew -p "examples/tutorial/${example}" check --include-build ../../.. done - build-dokka: - name: "Generate Dokka files" - runs-on: ubuntu-latest + build-deploy-website: + name: Assemble and deploy website needs: [validate-wrapper] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 with: distribution: "temurin" java-version: "11" - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 - - - name: Generate Dokka documentation - run: ./gradlew :website:rewriteDokkaLinks - - build-docs: - name: "Build Docusaurus" - needs: [validate-wrapper] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 with: version: 7 @@ -111,27 +97,6 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - - name: Build documentation website - run: ./gradlew :docs:docusaurusBuild - - build-deploy-website: - name: Assemble and deploy website - needs: [validate-wrapper, build-docs, build-dokka, check, check-examples] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-java@v4 - with: - distribution: "temurin" - java-version: "11" - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 - - # TODO maybe unnecessary - - uses: actions/setup-node@v4 - - name: Assemble website files run: ./gradlew :website:assembleFiles From 085eeace8f3351a34afc4277fb366d6e746333ea Mon Sep 17 00:00:00 2001 From: Matthieu S Date: Sun, 20 Oct 2024 17:34:55 +0200 Subject: [PATCH 4/5] chore: tweak dependencies for release publishing --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9efee281..7bd0226b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -142,7 +142,7 @@ jobs: name: Publish release if: "github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')" runs-on: ubuntu-latest - needs: [validate-wrapper, check, build-deploy-website] + needs: [validate-wrapper, check, build-deploy-website, check-examples] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 From 21fde259928ebd95e2bd31367ed031f936c3492e Mon Sep 17 00:00:00 2001 From: Matthieu S Date: Sun, 20 Oct 2024 22:20:21 +0200 Subject: [PATCH 5/5] chore: last tweaks --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7bd0226b..fd8d998a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -107,7 +107,7 @@ jobs: publish-dir: "website/build/output" github-token: ${{ secrets.GITHUB_TOKEN }} enable-pull-request-comment: true - enable-commit-comment: true + enable-commit-comment: false overwrites-pull-request-comment: true netlify-config-path: ./netlify.toml env: @@ -159,5 +159,4 @@ jobs: ORG_GRADLE_PROJECT_mavenCentralReleasePassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} - # No build cache here to be 100% sure that cache weirdness cannot affect the final, definitive jars run: ./gradlew -PpublishRelease -Psign publish