lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-02-25 21:22:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch CI build from Java 15 to Java 16

Browse Source 
Closes gh-1203
This commit is contained in:
Stephane Nicoll
2021-03-18 08:45:20 +01:00
parent 83f48e3d10
commit 9028076cb7
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/images/ci-image-jdk15/Dockerfile → ci/images/ci-image-jdk16/Dockerfile
View File

@@ -2,7 +2,7 @@ FROM ubuntu:focal-20210217
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java15 RUN ./setup.sh java16
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH

4
ci/images/get-jdk-url.sh
View File

@@ -8,8 +8,8 @@ case "$1" in
java11) java11)
echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz" echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
;; ;;
java15) java16)
echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz" echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz"
;; ;;
*) *)
echo $"Unknown java version" echo $"Unknown java version"

32
ci/pipeline.yml
View File

@@ -112,12 +112,12 @@ resources:
source: source:
<<: *registry-image-resource-source <<: *registry-image-resource-source
repository: ((docker-hub-organization))/initializr-ci-jdk11 repository: ((docker-hub-organization))/initializr-ci-jdk11
- name: ci-image-jdk15 - name: ci-image-jdk16
type: registry-image type: registry-image
icon: docker icon: docker
source: source:
<<: *registry-image-resource-source <<: *registry-image-resource-source
repository: ((docker-hub-organization))/initializr-ci-jdk15 repository: ((docker-hub-organization))/initializr-ci-jdk16
- name: artifactory-repo - name: artifactory-repo
type: artifactory-resource type: artifactory-resource
icon: package-variant icon: package-variant
@@ -142,14 +142,14 @@ resources:
access_token: ((github-ci-status-token)) access_token: ((github-ci-status-token))
branch: ((branch)) branch: ((branch))
context: jdk11-build context: jdk11-build
- name: repo-status-jdk15-build - name: repo-status-jdk16-build
type: github-status-resource type: github-status-resource
icon: eye-check-outline icon: eye-check-outline
source: source:
repository: ((github-repo-name)) repository: ((github-repo-name))
access_token: ((github-ci-status-token)) access_token: ((github-ci-status-token))
branch: ((branch)) branch: ((branch))
context: jdk15-build context: jdk16-build
- name: slack-alert - name: slack-alert
type: slack-notification type: slack-notification
icon: slack icon: slack
@@ -180,13 +180,13 @@ jobs:
image: ci-image-jdk11 image: ci-image-jdk11
vars: vars:
ci-image-name: ci-image-jdk11 ci-image-name: ci-image-jdk11
- task: build-ci-image-jdk15 - task: build-ci-image-jdk16
privileged: true privileged: true
file: git-repo/ci/tasks/build-ci-image.yml file: git-repo/ci/tasks/build-ci-image.yml
output_mapping: output_mapping:
image: ci-image-jdk15 image: ci-image-jdk16
vars: vars:
ci-image-name: ci-image-jdk15 ci-image-name: ci-image-jdk16
- in_parallel: - in_parallel:
- put: ci-image - put: ci-image
params: params:
@@ -194,9 +194,9 @@ jobs:
- put: ci-image-jdk11 - put: ci-image-jdk11
params: params:
image: ci-image-jdk11/image.tar image: ci-image-jdk11/image.tar
- put: ci-image-jdk15 - put: ci-image-jdk16
params: params:
image: ci-image-jdk15/image.tar image: ci-image-jdk16/image.tar
- name: build - name: build
serial: true serial: true
public: true public: true
@@ -256,28 +256,28 @@ jobs:
- put: slack-alert - put: slack-alert
params: params:
<<: *slack-success-params <<: *slack-success-params
- name: jdk15-build - name: jdk16-build
serial: true serial: true
public: true public: true
plan: plan:
- get: ci-image-jdk15 - get: ci-image-jdk16
- get: git-repo - get: git-repo
- get: daily - get: daily
trigger: true trigger: true
- put: repo-status-jdk15-build - put: repo-status-jdk16-build
params: { state: "pending", commit: "git-repo" } params: { state: "pending", commit: "git-repo" }
- do: - do:
- task: build-project - task: build-project
image: ci-image-jdk15 image: ci-image-jdk16
<<: *build-project-task-params <<: *build-project-task-params
on_failure: on_failure:
do: do:
- put: repo-status-jdk15-build - put: repo-status-jdk16-build
params: { state: "failure", commit: "git-repo" } params: { state: "failure", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
<<: *slack-fail-params <<: *slack-fail-params
- put: repo-status-jdk15-build - put: repo-status-jdk16-build
params: { state: "success", commit: "git-repo" } params: { state: "success", commit: "git-repo" }
- put: slack-alert - put: slack-alert
params: params:
@@ -393,7 +393,7 @@ jobs:
body: generated-changelog/changelog.md body: generated-changelog/changelog.md
groups: groups:
- name: "build" - name: "build"
jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"] jobs: ["build", "jdk11-build", "jdk16-build", "windows-build"]
- name: "releases" - name: "releases"
jobs: ["stage-release", "promote-release", "create-github-release"] jobs: ["stage-release", "promote-release", "create-github-release"]
- name: "ci-images" - name: "ci-images"