Skip to content

Commit 9a485f8

Browse files
committed
Rework CI pipeline
1 parent e4e57ba commit 9a485f8

19 files changed

+319
-240
lines changed

ci/config/release-scripts.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
logging:
2+
level:
3+
io.spring.concourse: DEBUG
4+
spring:
5+
main:
6+
banner-mode: off
7+
sonatype:
8+
exclude:
9+
- 'build-info\.json'
10+
- '.*\.zip'

ci/images/ci-image/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
FROM ubuntu:bionic-20181018
1+
FROM ubuntu:focal-20210401
22

33
ADD setup.sh /setup.sh
4+
ADD get-jdk-url.sh /get-jdk-url.sh
5+
ADD get-docker-url.sh /get-docker-url.sh
46
RUN ./setup.sh
57

68
ENV JAVA_HOME /opt/openjdk

ci/images/get-docker-url.sh

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
set -e
3+
4+
version="20.10.6"
5+
echo "https://download.docker.com/linux/static/stable/x86_64/docker-$version.tgz";

ci/images/get-jdk-url.sh

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
set -e
3+
4+
case "$1" in
5+
java8)
6+
echo "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz"
7+
;;
8+
java11)
9+
echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz"
10+
;;
11+
java16)
12+
echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz"
13+
;;
14+
*)
15+
echo $"Unknown java version"
16+
exit 1
17+
esac

ci/images/setup.sh

+10-11
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,36 @@ set -ex
44
###########################################################
55
# UTILS
66
###########################################################
7-
7+
export DEBIAN_FRONTEND=noninteractive
88
apt-get update
9-
apt-get install --no-install-recommends -y ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq
9+
apt-get install --no-install-recommends -y tzdata ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq fontconfig
10+
ln -fs /usr/share/zoneinfo/UTC /etc/localtime
11+
dpkg-reconfigure --frontend noninteractive tzdata
1012
rm -rf /var/lib/apt/lists/*
11-
12-
curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/concourse-java.sh > /opt/concourse-java.sh
13-
13+
curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh
14+
curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar
1415

1516
###########################################################
1617
# JAVA
1718
###########################################################
18-
JDK_URL="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz"
19+
JDK_URL=$( ./get-jdk-url.sh java11 )
1920

2021
mkdir -p /opt/openjdk
2122
cd /opt/openjdk
2223
curl -L ${JDK_URL} | tar zx --strip-components=1
2324
test -f /opt/openjdk/bin/java
2425
test -f /opt/openjdk/bin/javac
2526

26-
2727
###########################################################
2828
# DOCKER
2929
###########################################################
30-
3130
cd /
32-
curl -L https://download.docker.com/linux/static/stable/x86_64/docker-18.06.1-ce.tgz | tar zx
31+
DOCKER_URL=$( ./get-docker-url.sh )
32+
curl -L ${DOCKER_URL} | tar zx
3333
mv /docker/* /bin/
3434
chmod +x /bin/docker*
35-
3635
export ENTRYKIT_VERSION=0.4.0
3736
curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSION}/entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz | tar zx
3837
chmod +x entrykit && \
3938
mv entrykit /bin/entrykit && \
40-
entrykit --symlink
39+
entrykit --symlink

ci/parameters.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
github-repo: "https://github.com/spring-io/spring-javaformat.git"
2-
github-repo-name: "spring-io/spring-javaformat"
3-
docker-hub-organization: "springci"
4-
artifactory-server: "https://repo.spring.io"
5-
branch: "master"
6-
build-name: "spring-javaformat"
7-
bintray-subject: "spring"
8-
bintray-repo: "jars"
1+
project: spring-javaformat
2+
branch: main
3+
milestone: 0.0.x
4+
github-owner: spring-io
5+
github-repository: spring-javaformat
6+
docker-hub-ci-organization: springci
7+
ci-image: spring-javaformat-ci
8+
artifactory-server: https://repo.spring.io
9+
build-name: spring-javaformat
10+
task-timeout: 2h00m

0 commit comments

Comments
 (0)