From 1044621caf572ddf98d80d21b10bd91faeb1d5c6 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Mon, 20 Jul 2020 16:58:36 -0700 Subject: [PATCH 01/16] Setup initial CI pipeline file --- .../continuous-integration-workflow.yml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/continuous-integration-workflow.yml diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml new file mode 100644 index 00000000..02ed3937 --- /dev/null +++ b/.github/workflows/continuous-integration-workflow.yml @@ -0,0 +1,30 @@ +name: CI + +on: + push: + branches: + - deploy-pipeline-test +# schedule: +# - cron: '0 10 * * *' # Once per day at 10am UTC + +jobs: + build: + name: Build + runs-on: ubuntu-latest + strategy: + matrix: + jdk: [8, 11] + fail-fast: false + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.jdk }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.jdk }} + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + - name: Build with Gradle + run: ./gradlew clean build --no-daemon --stacktrace From 68f867b60b5647fa4bf1d2953ec8b03909c2e2fc Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Fri, 24 Jul 2020 10:30:47 -0700 Subject: [PATCH 02/16] Delete Jenkinsfile --- Jenkinsfile | 143 ---------------------------------------------------- 1 file changed, 143 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index ecfe3c30..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,143 +0,0 @@ -properties([ - buildDiscarder(logRotator(numToKeepStr: '10')), - pipelineTriggers([ - cron('@daily') - ]), -]) - -def SUCCESS = hudson.model.Result.SUCCESS.toString() -currentBuild.result = SUCCESS - -try { - parallel check: { - stage('Check') { - timeout(time: 45, unit: 'MINUTES') { - node('linux') { - label 'spring-session' - checkout scm - sh "git clean -dfx" - try { - withEnv(["JAVA_HOME=${tool 'jdk8'}"]) { - sh './gradlew clean check --no-daemon --stacktrace' - } - } - catch (e) { - currentBuild.result = 'FAILED: check' - throw e - } - finally { - junit '**/build/test-results/*/*.xml' - } - } - } - } - }, - jdk11: { - stage('JDK 11') { - timeout(time: 45, unit: 'MINUTES') { - node('linux') { - checkout scm - sh "git clean -dfx" - try { - withEnv(["JAVA_HOME=${tool 'jdk11'}"]) { - sh './gradlew clean test integrationTest --no-daemon --stacktrace' - } - } - catch (e) { - currentBuild.result = 'FAILED: jdk11' - throw e - } - } - } - } - }, - jdk12: { - stage('JDK 12') { - timeout(time: 45, unit: 'MINUTES') { - node('linux') { - checkout scm - try { - withEnv(["JAVA_HOME=${tool 'openjdk12'}"]) { - sh './gradlew clean test integrationTest --no-daemon --stacktrace' - } - } - catch (e) { - currentBuild.result = 'FAILED: jdk12' - throw e - } - } - } - } - } - - if (currentBuild.result == 'SUCCESS') { - parallel artifacts: { - stage('Deploy Artifacts') { - node('linux') { - checkout scm - sh "git clean -dfx" - try { - withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) { - withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { - withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { - withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { - withEnv(["JAVA_HOME=${tool 'jdk8'}"]) { - sh './gradlew deployArtifacts --no-daemon --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD' - sh './gradlew finalizeDeployArtifacts --no-daemon --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD' - } - } - } - } - } - } - catch (e) { - currentBuild.result = 'FAILED: artifacts' - throw e - } - } - } - }, - docs: { - stage('Deploy Docs') { - node('linux') { - checkout scm - sh "git clean -dfx" - try { - withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - withEnv(["JAVA_HOME=${tool 'jdk8'}"]) { - sh './gradlew deployDocs --no-daemon --stacktrace -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME' - } - } - } - catch (e) { - currentBuild.result = 'FAILED: docs' - throw e - } - } - } - } - } -} -finally { - def buildStatus = currentBuild.result - def buildNotSuccess = !SUCCESS.equals(buildStatus) - def lastBuildNotSuccess = !SUCCESS.equals(currentBuild.previousBuild?.result) - - if (buildNotSuccess || lastBuildNotSuccess) { - stage('Notify') { - node { - final def RECIPIENTS = [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']] - - def subject = "${buildStatus}: Build ${env.JOB_NAME} ${env.BUILD_NUMBER} status is now ${buildStatus}" - def details = "The build status changed to ${buildStatus}. For details see ${env.BUILD_URL}" - - emailext( - subject: subject, - body: details, - recipientProviders: RECIPIENTS, - to: "$SPRING_SESSION_TEAM_EMAILS" - ) - } - } - } -} From 805820eeea75d3963fcadbfbf2b1b44031a4b940 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Fri, 24 Jul 2020 10:31:52 -0700 Subject: [PATCH 03/16] Remove JDK version matrix for now --- .../workflows/continuous-integration-workflow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 02ed3937..42d78178 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -11,16 +11,16 @@ jobs: build: name: Build runs-on: ubuntu-latest - strategy: - matrix: - jdk: [8, 11] - fail-fast: false +# strategy: +# matrix: +# jdk: [8, 11] +# fail-fast: false steps: - uses: actions/checkout@v2 - - name: Set up JDK ${{ matrix.jdk }} + - name: Set up JDK 8 uses: actions/setup-java@v1 with: - java-version: ${{ matrix.jdk }} + java-version: '8' - name: Cache Gradle packages uses: actions/cache@v2 with: From dfd6a0bc1b6e9ba9cd4d1e524bad7a5bc35597b0 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Fri, 24 Jul 2020 10:56:15 -0700 Subject: [PATCH 04/16] Add in deploy artifacts and docs steps --- .../continuous-integration-workflow.yml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 42d78178..1544bfc4 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -28,3 +28,42 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - name: Build with Gradle run: ./gradlew clean build --no-daemon --stacktrace + artifacts: + name: Deploy Artifacts + needs: [build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: '8' + - name: Deploy artifacts + run: | + export VERSION_HEADER=$'Version: GnuPG v2\n\n' + export ORG_GRADLE_PROJECT_signingKey=${GPG_PRIVATE_KEY#"$VERSION_HEADER"} + export ORG_GRADLE_PROJECT_signingPassword="$GPG_PASSPHRASE" + ./gradlew deployArtifacts finalizeDeployArtifacts -PossrhUsername="$OSSRH_USERNAME" -PossrhPassword="$OSSRH_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace + env: + GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} + ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} + docs: + name: Deploy Docs + needs: [build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: '8' + - name: Deploy Docs + run: ./gradlew deployDocs --no-daemon -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace + env: + DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }} + DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }} + DOCS_HOST: ${{ secrets.DOCS_HOST }} From 6a791651e032f15ce3ce05947f5d6d7cf5a055b4 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Fri, 24 Jul 2020 14:41:00 -0700 Subject: [PATCH 05/16] Bump spring build conventions version to 0.0.34.BUILD-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 63c0c7fb..781d7954 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.32.RELEASE' + classpath 'io.spring.gradle:spring-build-conventions:0.0.34.BUILD-SNAPSHOT' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } } From 38adaeca94c3fd4a736d1478e65fa6f4acd88154 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Fri, 24 Jul 2020 14:48:11 -0700 Subject: [PATCH 06/16] Rev spring build conventions down to 0.0.33.RELEASE --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 781d7954..e5ca4118 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.34.BUILD-SNAPSHOT' + classpath 'io.spring.gradle:spring-build-conventions:0.0.33.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } } From 6080611d1d1eec980d35a3c085746939f9be5beb Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Fri, 24 Jul 2020 15:09:39 -0700 Subject: [PATCH 07/16] Bump back up to 0.0.34.BUILD-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e5ca4118..781d7954 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.33.RELEASE' + classpath 'io.spring.gradle:spring-build-conventions:0.0.34.BUILD-SNAPSHOT' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } } From 2a2c4307930621394a5281bd71840b4ff5594fb4 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Mon, 27 Jul 2020 09:44:01 -0700 Subject: [PATCH 08/16] Add URL for maven snapshots --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 781d7954..d26eb3b5 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,7 @@ buildscript { repositories { gradlePluginPortal() maven { url 'https://repo.spring.io/plugins-release/' } + maven { url 'https://repo.spring.io/plugins-snapshot' } } dependencies { From d602880a585e4dba786fbc4d048ca8136a10e674 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Mon, 27 Jul 2020 11:00:01 -0700 Subject: [PATCH 09/16] Re-introduce JDK matrix for CI pipeline --- .../workflows/continuous-integration-workflow.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 1544bfc4..6fd4efca 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -11,16 +11,16 @@ jobs: build: name: Build runs-on: ubuntu-latest -# strategy: -# matrix: -# jdk: [8, 11] -# fail-fast: false + strategy: + matrix: + jdk: [8, 11] + fail-fast: false steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 + - name: Set up JDK ${{ matrix.jdk }} uses: actions/setup-java@v1 with: - java-version: '8' + java-version: ${{ matrix.jdk }} - name: Cache Gradle packages uses: actions/cache@v2 with: From c21fff1a0031d5bfeb1749bdd6cf8ab39ea424f6 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Mon, 27 Jul 2020 11:57:36 -0700 Subject: [PATCH 10/16] Add cron job back in --- .github/workflows/continuous-integration-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 6fd4efca..3b39f2dc 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -4,8 +4,8 @@ on: push: branches: - deploy-pipeline-test -# schedule: -# - cron: '0 10 * * *' # Once per day at 10am UTC + schedule: + - cron: '0 10 * * *' # Once per day at 10am UTC jobs: build: From 73845048717270787873e5218fa897b105818ac5 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Mon, 27 Jul 2020 12:14:12 -0700 Subject: [PATCH 11/16] Fix YAML spacing issue --- .github/workflows/continuous-integration-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 3b39f2dc..5eb5b18f 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -4,8 +4,8 @@ on: push: branches: - deploy-pipeline-test - schedule: - - cron: '0 10 * * *' # Once per day at 10am UTC + schedule: + - cron: '0 10 * * *' # Once per day at 10am UTC jobs: build: From 6bce5ddf7f4acd3f43a14537cadb41a6d9b1bd27 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Tue, 28 Jul 2020 11:43:49 -0700 Subject: [PATCH 12/16] Bump spring-build-conventions version and add README badge --- README.adoc | 2 ++ build.gradle | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 8085578e..c646dc44 100644 --- a/README.adoc +++ b/README.adoc @@ -2,6 +2,8 @@ image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] +image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=deploy-pipeline-test["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] + Spring Session provides an API and implementations for managing a user's session information, while also making it trivial to support clustered sessions without being tied to an application container specific solution. It also provides transparent integration with: diff --git a/build.gradle b/build.gradle index d26eb3b5..6ea0e4d2 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.34.BUILD-SNAPSHOT' + classpath 'io.spring.gradle:spring-build-conventions:0.0.34.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } } From cf911322c217c0168ea53cac9dec2752d6d9522a Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Tue, 28 Jul 2020 11:46:38 -0700 Subject: [PATCH 13/16] Update badge to point to master and trigger builds on push to master branch --- .github/workflows/continuous-integration-workflow.yml | 2 +- README.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 5eb5b18f..4211e5bf 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - deploy-pipeline-test + - master schedule: - cron: '0 10 * * *' # Once per day at 10am UTC diff --git a/README.adoc b/README.adoc index c646dc44..579e6f60 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,7 @@ image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] -image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=deploy-pipeline-test["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] +image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=master["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] Spring Session provides an API and implementations for managing a user's session information, while also making it trivial to support clustered sessions without being tied to an application container specific solution. It also provides transparent integration with: From b54fb41952ca8eb5f3a2df04643ffc24df4ef9b5 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Thu, 30 Jul 2020 14:10:10 -0700 Subject: [PATCH 14/16] Temporarily revert branch name changes to test artifact output This reverts commit cf911322c217c0168ea53cac9dec2752d6d9522a. --- .github/workflows/continuous-integration-workflow.yml | 2 +- README.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 4211e5bf..5eb5b18f 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - deploy-pipeline-test schedule: - cron: '0 10 * * *' # Once per day at 10am UTC diff --git a/README.adoc b/README.adoc index 579e6f60..c646dc44 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,7 @@ image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] -image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=master["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] +image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=deploy-pipeline-test["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] Spring Session provides an API and implementations for managing a user's session information, while also making it trivial to support clustered sessions without being tied to an application container specific solution. It also provides transparent integration with: From 729ce133906d1d50d22fd30851b4feeb7624c78f Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Thu, 30 Jul 2020 14:34:37 -0700 Subject: [PATCH 15/16] Add Gradle enterprise cache values to build steps --- .../workflows/continuous-integration-workflow.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 5eb5b18f..1d8119c7 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -40,6 +40,9 @@ jobs: java-version: '8' - name: Deploy artifacts run: | + export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER" + export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" + export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" export VERSION_HEADER=$'Version: GnuPG v2\n\n' export ORG_GRADLE_PROJECT_signingKey=${GPG_PRIVATE_KEY#"$VERSION_HEADER"} export ORG_GRADLE_PROJECT_signingPassword="$GPG_PASSPHRASE" @@ -51,6 +54,9 @@ jobs: OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} + GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} + GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} docs: name: Deploy Docs needs: [build] @@ -62,8 +68,15 @@ jobs: with: java-version: '8' - name: Deploy Docs - run: ./gradlew deployDocs --no-daemon -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace + run: | + export GRADLE_ENTERPRISE_CACHE_USERNAME="$GRADLE_ENTERPRISE_CACHE_USER" + export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" + export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" + ./gradlew deployDocs --no-daemon -PdeployDocsSshKey="$DOCS_SSH_KEY" -PdeployDocsSshUsername="$DOCS_USERNAME" -PdeployDocsHost="$DOCS_HOST" --stacktrace env: DOCS_USERNAME: ${{ secrets.DOCS_USERNAME }} DOCS_SSH_KEY: ${{ secrets.DOCS_SSH_KEY }} DOCS_HOST: ${{ secrets.DOCS_HOST }} + GRADLE_ENTERPRISE_CACHE_USER: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} + GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} + GRADLE_ENTERPRISE_SECRET_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} From 8d2ec1ea4469173b3754fd87c9a26e26e84d91e2 Mon Sep 17 00:00:00 2001 From: Ellie Bahadori Date: Thu, 30 Jul 2020 14:53:18 -0700 Subject: [PATCH 16/16] Bring back master branch in preparation for merge This reverts commit b54fb41952ca8eb5f3a2df04643ffc24df4ef9b5. --- .github/workflows/continuous-integration-workflow.yml | 2 +- README.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 1d8119c7..76435db3 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - deploy-pipeline-test + - master schedule: - cron: '0 10 * * *' # Once per day at 10am UTC diff --git a/README.adoc b/README.adoc index c646dc44..579e6f60 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,7 @@ image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] -image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=deploy-pipeline-test["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] +image:https://github.com/spring-projects/spring-session/workflows/CI/badge.svg?branch=master["Build Status", link="https://github.com/spring-projects/spring-session/actions?query=workflow%3ACI"] Spring Session provides an API and implementations for managing a user's session information, while also making it trivial to support clustered sessions without being tied to an application container specific solution. It also provides transparent integration with: