Skip to content

Commit af179bd

Browse files
gregturngregturn
committed
Improve pipeline.
1 parent b04a030 commit af179bd

File tree

3 files changed

+45
-66
lines changed

3 files changed

+45
-66
lines changed

‎README.adoc

+8-45
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,20 @@ Check the matrix below to see the status of supported versions:
5353
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2011%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
5454
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x/jobs/Test%20-%20JDK%2011%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb-2.0.x"]
5555

56-
| Test - JDK 12*
57-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2012/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
56+
| Test - JDK 13*
57+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
5858
|
5959

60-
| Test - JDK 12* and Spring.NEXT
61-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2012%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
60+
| Test - JDK 13* and Spring.NEXT
61+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013%20and%20Spring.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
6262
|
6363

64-
| Test - JDK 12* and Spring.NEXT 5.1
65-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2012%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
64+
| Test - JDK 13* and Spring.NEXT 5.1
65+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013%20and%20Spring.NEXT%205.1/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
6666
|
6767

68-
| Test - JDK 12* and Spring Data.NEXT
69-
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2012%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
68+
| Test - JDK 13* and Spring Data.NEXT
69+
| image:https://ci.spring.io/api/v1/teams/spring-team/pipelines/spring-session-data-mongodb/jobs/Test%20-%20JDK%2013%20and%20Spring%20Data.NEXT/badge[link="https://ci.spring.io/teams/spring-team/pipelines/spring-session-data-mongodb"]
7070
|
7171

7272
| Build - Release to repo.spring.io
@@ -87,43 +87,6 @@ This will generate the artifact.
8787

8888
You can also import the project into your IDE.
8989

90-
== Releasing Spring Session MongoDB
91-
92-
To do a release (.RELEASE, .RC?, .M?):
93-
94-
. Check in all changes and ensure there are no edited files.
95-
. Run `ci/create-release.sh <release version> <snapshot version>` e.g. (`ci/create-release.sh 2.1.1.RELEASE 2.1.2.BUILD-SNAPSHOT`)
96-
97-
From here, test things out locally.
98-
99-
. `git checkout release`
100-
. `./mvn clean package`
101-
. ...do all your testing...
102-
103-
Once verified, push the `release` branch to `origin` and let the CI server deploy it.
104-
105-
. `git push`
106-
107-
After a clean release, switch back to master branch and push the master development branch.
108-
109-
. `git checkout master`
110-
. `git push`
111-
. `git push --tags`
112-
113-
//To deploy your changes:
114-
//
115-
//. `git checkout release`
116-
//. Execute a maven deploy.
117-
//* For a milestone: `USERNAME=<user> PASSWORD=<encrypted password> ./mvnw -Pdistribute,milestone,docs clean deploy`
118-
//* For a release: `USERNAME=<user> PASSWORD=<encrypted password> ./mvnw -Pdistribute,release,docs clean deploy`
119-
//* For a release to maven central: `USERNAME=<user> PASSWORD=<nexus password> ./mvnw -Pdistribute,gpg,central clean deploy -s settings.xml` (At SonaType, *close* and *releases*)
120-
//. Inspect handiwork at https://repo.spring.io/ or https://oss.sonatype.org/#stagingRepositories
121-
122-
123-
CI server should build the new snapshot and automatically deploy to artifactory.
124-
125-
NOTE: A word about reference documentation. Based upon https://github.com/spring-projects/spring-framework/wiki/gradle-build-and-release-faq#user-content-wiki-docs_schema_dist_publication[this], the `distribute` profile contains an artifactory property that is applied to the ZIP file generated by the `docs` profile. A CRON job will scoop up the zipped up docs and unpack them inside the target location.
126-
12790
== Code of Conduct
12891
This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
12992
By participating, you are expected to uphold this code. Please report unacceptable behavior to [email protected].

‎ci/README.adoc

+17-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,20 @@ With these pipelines in place, you can now activate and expose them:
4444
% fly -t spring-team expose-pipeline -p spring-session-data-mongodb
4545
% fly -t spring-team unpause-pipeline -p spring-session-data-mongodb-2.0.x
4646
% fly -t spring-team expose-pipeline -p spring-session-data-mongodb-2.x
47-
----
47+
----
48+
49+
=== Making a release
50+
51+
1. Create a new release (on the main branch).
52+
----
53+
% ci/create-release.sh <release version> <next snapshot version>
54+
----
55+
56+
2. With the release tagged, push the tagged version to the release branch.
57+
----
58+
% git checkout -b release
59+
% git reset --hard <tag>
60+
% git push -f origin release
61+
----
62+
63+
NOTE: You can chain the previous set of commands together using `&&`.

‎ci/pipeline-template.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ resources:
3636
repository: openjdk
3737
tag: 11-jdk
3838

39-
- name: openjdk:12-jdk
39+
- name: openjdk:13-jdk
4040
type: docker-image
4141
source:
4242
repository: openjdk
43-
tag: 12-jdk
43+
tag: 13-jdk
4444

4545
- name: spring-session-data-mongodb-github
4646
type: git
@@ -88,8 +88,8 @@ groups:
8888
- Test - JDK 8 and Spring.NEXT
8989
- Test - JDK 11
9090
- Test - JDK 11 and Spring.NEXT
91-
- Test - JDK 12
92-
- Test - JDK 12 and Spring.NEXT
91+
- Test - JDK 13
92+
- Test - JDK 13 and Spring.NEXT
9393
- Build
9494
- name: pull-requests
9595
jobs:
@@ -160,31 +160,31 @@ jobs:
160160
<<: *slack-success
161161
<<: *slack-failure
162162

163-
- name: Test - JDK 12
163+
- name: Test - JDK 13
164164
serial: true
165165
public: true
166166
plan:
167167
- get: spring-session-data-mongodb-github
168168
trigger: true
169-
- get: openjdk:12-jdk
169+
- get: openjdk:13-jdk
170170
trigger: true
171171
- task: test
172-
image: openjdk:12-jdk
172+
image: openjdk:13-jdk
173173
file: spring-session-data-mongodb-github/ci/test.yml
174174
params: { PROFILE: "convergence" }
175175
<<: *slack-success
176176
<<: *slack-failure
177177

178-
- name: Test - JDK 12 and Spring.NEXT
178+
- name: Test - JDK 13 and Spring.NEXT
179179
serial: true
180180
public: true
181181
plan:
182182
- get: spring-session-data-mongodb-github
183183
trigger: true
184-
- get: openjdk:12-jdk
184+
- get: openjdk:13-jdk
185185
trigger: true
186186
- task: test
187-
image: openjdk:12-jdk
187+
image: openjdk:13-jdk
188188
file: spring-session-data-mongodb-github/ci/test.yml
189189
params: { PROFILE: "spring-next,convergence" }
190190
<<: *slack-success
@@ -201,8 +201,8 @@ jobs:
201201
Test - JDK 8 and Spring.NEXT,
202202
Test - JDK 11,
203203
Test - JDK 11 and Spring.NEXT,
204-
Test - JDK 12,
205-
Test - JDK 12 and Spring.NEXT
204+
Test - JDK 13,
205+
Test - JDK 13 and Spring.NEXT
206206
]
207207
- put: spring-session-data-mongodb-status
208208
params:
@@ -221,7 +221,7 @@ jobs:
221221
- "/**"
222222
properties:
223223
zip.deployed: false
224-
zip.displayname: "Spring Session Data MongoDB"
224+
zip.displayname: "spring-session-data-mongodb"
225225
zip.name: "spring-session-data-mongodb"
226226
zip.type: "docs"
227227
on_failure:
@@ -261,7 +261,7 @@ jobs:
261261
trigger: true
262262
version: every
263263
- get: openjdk:11-jdk
264-
- get: openjdk:12-jdk
264+
- get: openjdk:13-jdk
265265
- put: spring-session-data-mongodb-pull-requests
266266
params:
267267
path: spring-session-data-mongodb-github
@@ -281,12 +281,12 @@ jobs:
281281
image: openjdk:11-jdk
282282
file: spring-session-data-mongodb-github/ci/test.yml
283283
params: { PROFILE: "spring-next,convergence" }
284-
- task: test (JDK 12)
285-
image: openjdk:12-jdk
284+
- task: test (JDK 13)
285+
image: openjdk:13-jdk
286286
file: spring-session-data-mongodb-github/ci/test.yml
287287
params: { PROFILE: "convergence" }
288-
- task: test (JDK 12 and Spring.NEXT)
289-
image: openjdk:12-jdk
288+
- task: test (JDK 13 and Spring.NEXT)
289+
image: openjdk:13-jdk
290290
file: spring-session-data-mongodb-github/ci/test.yml
291291
params: { PROFILE: "spring-next,convergence" }
292292
on_failure:
@@ -327,7 +327,7 @@ jobs:
327327
trigger: true
328328
- put: spring-session-data-mongodb-status
329329
params:
330-
commit: spring-session-data-mongodb-release
330+
commit: spring-session-data-mongodb-github
331331
state: pending
332332
- task: build
333333
file: spring-session-data-mongodb-github/ci/build.yml
@@ -342,7 +342,7 @@ jobs:
342342
- "/**"
343343
properties:
344344
zip.deployed: false
345-
zip.displayname: "Spring Session Data MongoDB"
345+
zip.displayname: "spring-session-data-mongodb"
346346
zip.name: "spring-session-data-mongodb"
347347
zip.type: "docs"
348348
on_failure:

0 commit comments

Comments
 (0)