diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 00f9e66c..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: build-{build}.{branch} -image: Visual Studio 2017 - -environment: - matrix: - - version: 15 - variant: windowsservercore-ltsc2016 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - version: 15 - variant: windowsservercore-1809 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - version: 14 - variant: windowsservercore-ltsc2016 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - version: 14 - variant: windowsservercore-1809 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - version: 11 - variant: windowsservercore-ltsc2016 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - version: 11 - variant: windowsservercore-1809 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - version: 8 - variant: windowsservercore-ltsc2016 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - version: 8 - variant: windowsservercore-1809 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - -install: - - ps: | - [Environment]::SetEnvironmentVariable('dockerImage', ('openjdk:{0}' -f $env:version), [EnvironmentVariableTarget]::Process); - [Environment]::SetEnvironmentVariable('buildDirectory', ('{0}/jdk/windows/{1}' -f $env:version, $env:variant), [EnvironmentVariableTarget]::Process); - -build_script: - - cmd: appveyor-retry docker build --pull -t %dockerImage% %buildDirectory% - -after_build: - - cmd: docker images - -test_script: - - cmd: docker run --rm %dockerImage% java -version - - cmd: docker run --rm %dockerImage% javac -version diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..155ef316 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,48 @@ +name: GitHub CI + +on: + pull_request: + push: + schedule: + - cron: 0 0 * * 0 + +defaults: + run: + shell: 'bash -Eeuo pipefail -x {0}' + +jobs: + + generate-jobs: + name: Generate Jobs + runs-on: ubuntu-latest + outputs: + strategy: ${{ steps.generate-jobs.outputs.strategy }} + steps: + - uses: actions/checkout@v1 + - id: generate-jobs + name: Generate Jobs + run: | + git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew + strategy="$(~/bashbrew/scripts/github-actions/generate.sh)" + jq . <<<"$strategy" # sanity check / debugging aid + echo "::set-output name=strategy::$strategy" + + test: + needs: generate-jobs + strategy: ${{ fromJson(needs.generate-jobs.outputs.strategy) }} + name: ${{ matrix.name }} + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v1 + - name: Prepare Environment + run: ${{ matrix.runs.prepare }} + - name: Pull Dependencies + run: ${{ matrix.runs.pull }} + - name: Build ${{ matrix.name }} + run: ${{ matrix.runs.build }} + - name: History ${{ matrix.name }} + run: ${{ matrix.runs.history }} + - name: Test ${{ matrix.name }} + run: ${{ matrix.runs.test }} + - name: '"docker images"' + run: ${{ matrix.runs.images }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f2c1c493..00000000 --- a/.travis.yml +++ /dev/null @@ -1,76 +0,0 @@ -language: bash -services: docker - -matrix: - include: - - os: linux - env: VERSION=15 VARIANT=oracle - - os: linux - env: VERSION=15 - - os: linux - env: VERSION=15 VARIANT=slim - - os: linux - env: VERSION=15 VARIANT=alpine - - os: linux - env: VERSION=14 VARIANT=oracle - - os: linux - env: VERSION=14 - - os: linux - env: VERSION=14 VARIANT=slim - - os: linux - env: VERSION=11 - - os: linux - env: VERSION=11 VARIANT=slim - - os: linux - env: VERSION=8 - - os: linux - env: VERSION=8 VARIANT=slim - -install: - - git clone https://github.com/docker-library/official-images.git ~/official-images - - if [ "$TRAVIS_OS_NAME" = 'linux' ]; then wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash; fi - -before_script: - - env | sort - - cd "$VERSION" - - imageBase="openjdk:$VERSION" - - imageSuffix="${VARIANT:+-$(basename "$VARIANT")}" - -script: - - | - ( - set -Eeuo pipefail - build_and_test() { - local img="$1"; shift - local dir="$1"; shift - ( set -x; docker build -t "$img" "$dir" ) - if [ "$TRAVIS_OS_NAME" = 'windows' ]; then - # TODO make the real tests run successfully on Windows too! - if [[ "$img" == *-jdk* ]]; then ( set -x; docker run --rm "$img" javac -version ); fi - ( set -x; docker run --rm "$img" java -version ) - else - ( set -x; ~/official-images/test/run.sh "$img" ) - fi - } - build_and_test "$imageBase-jdk$imageSuffix" "jdk${VARIANT:+/$VARIANT}" - if [ -d "jre${VARIANT:+/$VARIANT}" ]; then - build_and_test "$imageBase-jre$imageSuffix" "jre${VARIANT:+/$VARIANT}" - fi - if [[ "${VARIANT:-}" == windows/windowsservercore-* ]]; then - nanoVariant="${VARIANT//windowsservercore/nanoserver}" - nanoSuffix="$(basename "$nanoVariant")" - for jdk in jdk jre; do - if [ -d "$jdk/$nanoVariant" ]; then - nanoFrom="$(grep -oEm1 -- '--from=[^ ]+' "$jdk/$nanoVariant/Dockerfile")" - nanoFrom="${nanoFrom#--from=}" - ( set -x; docker tag "$imageBase-$jdk$imageSuffix" "$nanoFrom" ) - build_and_test "$imageBase-$jdk-$nanoSuffix" "$jdk/$nanoVariant" - fi - done - fi - ) - -after_script: - - docker images - -# vim:set et ts=2 sw=2: diff --git a/README.md b/README.md index 62995b85..b04f67eb 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,11 @@ For outstanding `openjdk` image PRs, check [PRs with the "library/openjdk" label --- -- [![build status badge](https://img.shields.io/travis/docker-library/openjdk/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/openjdk/branches) -- [![build status badge](https://img.shields.io/appveyor/ci/docker-library/openjdk/master.svg?label=AppVeyor)](https://ci.appveyor.com/project/docker-library/openjdk) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/openjdk.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/openjdk) +- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/openjdk/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/openjdk/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) +- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/openjdk.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/openjdk/) | Build | Status | Badges | (per-arch) | |:-:|:-:|:-:|:-:| -| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/openjdk.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/openjdk) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/openjdk.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/openjdk) | [![windows-amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/openjdk.svg?label=windows-amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/openjdk) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/openjdk.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/openjdk) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/openjdk.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/openjdk/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/openjdk.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/openjdk/) | [![windows-amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/openjdk.svg?label=windows-amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/openjdk/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/openjdk.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/openjdk/) | diff --git a/update.sh b/update.sh index 4faa3f4c..b7d6c605 100755 --- a/update.sh +++ b/update.sh @@ -105,8 +105,6 @@ jdk-java-net-download-version() { echo "$downloadVersion" } -travisEnv= -appveyorEnv= for javaVersion in "${versions[@]}"; do for javaType in jdk jre; do dir="$javaVersion/$javaType" @@ -252,43 +250,4 @@ for javaVersion in "${versions[@]}"; do ;; esac done - - for winVariant in \ - nanoserver-1809 \ - windowsservercore-{1809,ltsc2016} \ - ; do - [ -f "$javaVersion/jdk/windows/$winVariant/Dockerfile" ] \ - || [ -f "$javaVersion/jre/windows/$winVariant/Dockerfile" ] \ - || continue - - case "$winVariant" in - nanoserver-*) ;; # nanoserver images COPY --from=...:...-windowsservercore-... - # https://www.appveyor.com/docs/windows-images-software/ - *-1809) - appveyorEnv='\n - version: '"$javaVersion"'\n variant: '"$winVariant"'\n APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019'"$appveyorEnv" - ;; - *-ltsc2016) - appveyorEnv='\n - version: '"$javaVersion"'\n variant: '"$winVariant"'\n APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017'"$appveyorEnv" - ;; - esac - done - - if [ -d "$javaVersion/jdk/alpine" ]; then - travisEnv='\n - os: linux\n env: VERSION='"$javaVersion"' VARIANT=alpine'"$travisEnv" - fi - if [ -d "$javaVersion/jdk/slim" ]; then - travisEnv='\n - os: linux\n env: VERSION='"$javaVersion"' VARIANT=slim'"$travisEnv" - fi - if [ -e "$javaVersion/jdk/Dockerfile" ]; then - travisEnv='\n - os: linux\n env: VERSION='"$javaVersion$travisEnv" - fi - if [ -d "$javaVersion/jdk/oracle" ]; then - travisEnv='\n - os: linux\n env: VERSION='"$javaVersion"' VARIANT=oracle'"$travisEnv" - fi done - -travis="$(awk -v 'RS=\n\n' '$1 == "matrix:" { $0 = "matrix:\n include:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)" -cat <<<"$travis" > .travis.yml - -appveyor="$(awk -v 'RS=\n\n' '$1 == "environment:" { $0 = "environment:\n matrix:'"$appveyorEnv"'" } { printf "%s%s", $0, RS }' .appveyor.yml)" -cat <<<"$appveyor" > .appveyor.yml