diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b6f6453..5201c3fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,14 +64,59 @@ jobs: name: test-results path: '*/build/reports/tests/**/*.*' retention-days: 3 - - name: Deploy artifacts - run: | - ./gradlew publishArtifacts finalizeDeployArtifacts -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace +# - name: Deploy artifacts +# run: | +# ./gradlew publishArtifacts finalizeDeployArtifacts --stacktrace -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" +# env: +# ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }} +# ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} +# OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} +# OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} deploy_artifacts: name: Deploy Artifacts needs: [build_jdk_17] runs-on: ubuntu-latest + steps: + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + - name: Set up gradle user name + shell: bash + run: | + mkdir -p /home/runner/.gradle + echo 'systemProp.user.name=spring-builds+github' >> /home/runner/.gradle/gradle.properties + - name: Gradle Wrapper Validation + uses: gradle/wrapper-validation-action@v1 + - name: Set up Gradle + uses: gradle/gradle-build-action@v2 + with: + cache-disabled: true + env: + GRADLE_USER_HOME: /home/runner/.gradle + +# - uses: actions/checkout@v3 +# - name: Set up gradle +# uses: spring-io/spring-gradle-build-action@v2 +# with: +# java-version: 17 +# distribution: temurin +# cache-disabled: true + - name: Deploy artifacts + run: | + ./gradlew publishArtifacts finalizeDeployArtifacts --stacktrace -PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" + env: + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} + OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} + OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} + + deploy_docs_antora: + name: Deploy Antora Docs + needs: [deploy_artifacts] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Set up gradle @@ -79,35 +124,36 @@ jobs: with: java-version: 17 distribution: temurin - cache-disabled: true - - name: Deploy artifacts - run: | - echo "*** Dummy job" - env: - ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }} - ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }} - OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }} - deploy_docs_antora: - name: Deploy Antora Docs - needs: [deploy_artifacts] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 + - name: Run Antora + run: ./gradlew antora + - name: Copy the cache to be included in the site + run: cp -rf build/antora/inject-collector-cache-config-extension/.cache build/site/ + - name: Publish Docs + uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.11 with: - ref: docs-build - fetch-depth: 1 - - name: Dispatch (partial build) - if: github.ref_type == 'branch' - env: - GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} - run: gh workflow run watch deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }} - - name: Dispatch (full build) - if: github.ref_type == 'tag' - env: - GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} - run: gh workflow run watch deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) + docs-username: ${{ secrets.DOCS_USERNAME }} + docs-host: ${{ secrets.DOCS_HOST }} + docs-ssh-key: ${{ secrets.DOCS_SSH_KEY }} + docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }} + - name: Bust Clouflare Cache + uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.11 + with: + context-root: spring-security + cloudflare-zone-id: ${{ secrets.CLOUDFLARE_ZONE_ID }} + cloudflare-cache-token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} +# +# - name: Dispatch (partial build) +# if: github.ref_type == 'branch' +# env: +# GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} +# run: gh workflow run watch deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }} +# - name: Dispatch (full build) +# if: github.ref_type == 'tag' +# env: +# GH_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }} +# run: gh workflow run watch deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) + + log_complete: name: Log Complete needs: [prerequisites, deploy_artifacts, deploy_docs_antora]