Commit Graph

389 Commits

Author SHA1 Message Date
Andy Wilkinson
1410ef2911 Merge branch '2.1.x' into 2.2.x
Closes gh-22193
2020-07-02 09:42:03 +01:00
Andy Wilkinson
c9958c2ab4 Upgrade CI to Docker 19.03.12
Closes gh-22189
2020-07-02 09:39:13 +01:00
Andy Wilkinson
e44640de89 Merge branch '2.1.x' into 2.2.x
Closes gh-22182
2020-07-01 13:48:08 +01:00
dreis2211
24072bed96 Improve error handling in JDK upgrade checks
See gh-22110
2020-07-01 13:45:50 +01:00
Andy Wilkinson
abeab73b2c Merge branch '2.1.x' into 2.2.x
Closes gh-22170
2020-06-30 16:45:46 +01:00
XenoAmess
89d4cda855 Remove duplicated icon from git-repo-windows resource definition
See gh-22163
2020-06-30 16:25:32 +01:00
Madhura Bhave
67060731bc Merge branch '2.1.x' into 2.2.x 2020-06-29 16:40:59 -07:00
Madhura Bhave
4a55a414e7 Fix typo 2020-06-29 16:40:24 -07:00
Andy Wilkinson
73a1047ad2 Merge branch '2.1.x' into 2.2.x
Closes gh-22005
2020-06-18 10:22:28 +01:00
Andy Wilkinson
db634d762e Update CI images to use ubuntu:bionic-20200526
Closes gh-22003
2020-06-18 10:17:39 +01:00
Phillip Webb
550b2847c5 Merge branch '2.1.x' into 2.2.x 2020-06-15 10:52:50 -07:00
Phillip Webb
b129a3f7fb Check that a distribution has been started
Update the releasescript to ensure that a distribution has been started
before starting it again. This functionality was accidentally removed
during the updates for gh-21474.

See gh-21474
2020-06-15 10:50:06 -07:00
Madhura Bhave
0395b186ad Merge branch '2.1.x' into 2.2.x 2020-06-15 09:23:26 -07:00
Madhura Bhave
9d9a90ccd4 Polish 2020-06-15 09:22:14 -07:00
Phillip Webb
209c5c4013 Merge branch '2.1.x' into 2.2.x 2020-06-11 23:19:16 -07:00
Phillip Webb
6d93d732b4 Cherry-pick release script updates
Cherry-pick release script updates from 2.3.x

See gh-21474
2020-06-11 23:15:10 -07:00
Phillip Webb
3fe4fb1373 Merge branch '2.1.x' into 2.2.x 2020-06-10 17:33:48 -07:00
Phillip Webb
418859fab6 Further reduce repetition in CI pipeline.yml
See gh-21716
2020-06-10 17:25:40 -07:00
Phillip Webb
da09e227c7 Merge branch '2.1.x' into 2.2.x 2020-06-10 17:14:37 -07:00
Phillip Webb
0957c7460b Polish pipeline YAML 2020-06-10 17:06:39 -07:00
Phillip Webb
f39a3f963b Merge branch '2.1.x' into 2.2.x 2020-06-10 16:44:22 -07:00
Phillip Webb
7e64f9709a Use milestone as docker tag
Update the pipeline YAML to use ((milestone)) rather than ((branch))
when tagging docker images.

See gh-21716
2020-06-10 16:43:09 -07:00
Phillip Webb
9aa8a073d6 Merge branch '2.1.x' into 2.2.x
Closes gh-21876
2020-06-10 16:33:34 -07:00
Phillip Webb
3a8d173845 Reduce repetition in CI pipeline.yml
Use YAML anchors and aliases to reduce the amount of repetition
in our CI pipeline YAML.

Closes gh-21716
2020-06-10 16:32:45 -07:00
Phillip Webb
ce13235e76 Polish 2020-06-10 16:32:45 -07:00
Andy Wilkinson
97533a5364 Merge branch '2.1.x' into 2.2.x
Closes gh-21682
2020-06-05 12:52:24 +01:00
Andy Wilkinson
20f0b41099 Upgrade CI to Docker 19.03.9
Closes gh-21681
2020-06-05 12:48:49 +01:00
Madhura Bhave
831bb1f206 Merge branch '2.1.x' into 2.2.x
Closes gh-21526
2020-05-20 15:29:50 -07:00
Madhura Bhave
bce48ea745 Upgrade CI to Docker 19.03.9
Closes gh-21525
2020-05-20 15:29:02 -07:00
Madhura Bhave
808cb98b98 Merge branch '2.1.x' into 2.2.x
Closes gh-21527
2020-05-20 14:35:27 -07:00
Madhura Bhave
7d197e6469 Don't add waiting-for-triage label for issues created by CI automation
Closes gh-21282
2020-05-20 14:32:48 -07:00
Phillip Webb
5eabb0400c Merge branch '2.1.x' into 2.2.x
Closes gh-21447
2020-05-13 23:01:02 -07:00
Phillip Webb
d7c7ca31f3 Upgrade to spring-javaformat 0.0.22
Closes gh-21446
2020-05-13 23:00:18 -07:00
Stephane Nicoll
487329fafa Merge branch '2.1.x' into 2.2.x
Closes gh-21260
2020-05-04 15:02:17 +02:00
Stephane Nicoll
e54b7d07c9 Upgrade Ubuntu version in CI images
Closes gh-21262
2020-05-04 14:19:02 +02:00
Stephane Nicoll
81268914b4 Upgrade Java 14 version in CI image
Closes gh-21087
2020-04-23 09:01:22 +02:00
Stephane Nicoll
ac5c7cb5e1 Upgrade Java 8 version in CI image
Closes gh-21088
2020-04-23 09:00:36 +02:00
Stephane Nicoll
66667964b3 Upgrade Java 8 version in CI image
Closes gh-21084
2020-04-23 08:58:36 +02:00
Madhura Bhave
aebf475e13 Merge branch '2.1.x' into 2.2.x
Closes gh-20979
2020-04-15 16:39:29 -07:00
Madhura Bhave
9d3d202837 Upgrade Java 11 version in CI image
Closes gh-20978
2020-04-15 16:38:04 -07:00
Madhura Bhave
a8bd62501d Merge branch '2.1.x' into 2.2.x
Closes gh-20981
2020-04-15 16:33:09 -07:00
Madhura Bhave
fd14c4e72a Switch docker upgrade script to submit issue rather than PR
Closes gh-20976
2020-04-15 16:31:49 -07:00
Madhura Bhave
e6c0a0dc35 Merge branch '2.1.x' into 2.2.x
Closes gh-20889
2020-04-08 13:33:42 -07:00
Madhura Bhave
b03ba02125 Upgrade Ubuntu version in CI images
Closes gh-20678
2020-04-08 13:31:51 -07:00
Madhura Bhave
520b8c8836 Merge branch '2.1.x' into 2.2.x 2020-04-06 19:17:10 -07:00
Madhura Bhave
7c36cd414d Add separate parameter for milestone name
Since the branch name doesn't always correspond to the milestone name,
eg, master.

See gh-20680
2020-04-06 19:14:52 -07:00
Madhura Bhave
41f26d3e23 Merge branch '2.1.x' into 2.2.x
Closes gh-20862
2020-04-06 19:09:07 -07:00
Madhura Bhave
1a3df294d0 Prevent duplication of issues created by CI automation
This is done by checking for existing issues only in the milestone
corresponding to the current branch. For issues, the milestone is assigned
at the time of issue creation. For PRs, since the branch is different the
milestone can be derived from that while triaging the issue.

Closes gh-20680
2020-04-06 19:05:26 -07:00
Madhura Bhave
d7c376adf6 Merge branch '2.1.x' into 2.2.x 2020-04-03 12:27:26 -07:00
Madhura Bhave
d5a3310b91 Fix CI dockerfile 2020-04-03 12:26:19 -07:00