diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..155ef3165 --- /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 3dc97b30b..000000000 --- a/.travis.yml +++ /dev/null @@ -1,71 +0,0 @@ -language: bash -services: docker - -env: - - CONTEXT=10.0/jdk14/openjdk-oracle - - CONTEXT=10.0/jdk14/openjdk-buster - - CONTEXT=10.0/jdk14/openjdk-slim-buster - - CONTEXT=10.0/jdk11/openjdk - - CONTEXT=10.0/jdk11/openjdk-slim - - CONTEXT=10.0/jdk11/adoptopenjdk-hotspot - - CONTEXT=10.0/jdk11/adoptopenjdk-openj9 - - CONTEXT=10.0/jdk11/corretto - - CONTEXT=10.0/jdk8/openjdk - - CONTEXT=10.0/jdk8/openjdk-slim - - CONTEXT=10.0/jdk8/adoptopenjdk-hotspot - - CONTEXT=10.0/jdk8/adoptopenjdk-openj9 - - CONTEXT=10.0/jdk8/corretto - - CONTEXT=9.0/jdk14/openjdk-oracle - - CONTEXT=9.0/jdk14/openjdk-buster - - CONTEXT=9.0/jdk14/openjdk-slim-buster - - CONTEXT=9.0/jdk11/openjdk - - CONTEXT=9.0/jdk11/openjdk-slim - - CONTEXT=9.0/jdk11/adoptopenjdk-hotspot - - CONTEXT=9.0/jdk11/adoptopenjdk-openj9 - - CONTEXT=9.0/jdk11/corretto - - CONTEXT=9.0/jdk8/openjdk - - CONTEXT=9.0/jdk8/openjdk-slim - - CONTEXT=9.0/jdk8/adoptopenjdk-hotspot - - CONTEXT=9.0/jdk8/adoptopenjdk-openj9 - - CONTEXT=9.0/jdk8/corretto - - CONTEXT=8.5/jdk14/openjdk-oracle - - CONTEXT=8.5/jdk14/openjdk-buster - - CONTEXT=8.5/jdk14/openjdk-slim-buster - - CONTEXT=8.5/jdk11/openjdk - - CONTEXT=8.5/jdk11/openjdk-slim - - CONTEXT=8.5/jdk11/adoptopenjdk-hotspot - - CONTEXT=8.5/jdk11/adoptopenjdk-openj9 - - CONTEXT=8.5/jdk11/corretto - - CONTEXT=8.5/jdk8/openjdk - - CONTEXT=8.5/jdk8/openjdk-slim - - CONTEXT=8.5/jdk8/adoptopenjdk-hotspot - - CONTEXT=8.5/jdk8/adoptopenjdk-openj9 - - CONTEXT=8.5/jdk8/corretto - - CONTEXT=7/jdk8/openjdk - - CONTEXT=7/jdk8/openjdk-slim - - CONTEXT=7/jdk8/adoptopenjdk-hotspot - - CONTEXT=7/jdk8/adoptopenjdk-openj9 - - CONTEXT=7/jdk8/corretto - -install: - - git clone https://github.com/docker-library/official-images.git ~/official-images - -before_script: - - env | sort - - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash - - cd "$CONTEXT" - - image="travis/tomcat:$(sed 's!/!-!g' <<<"$CONTEXT")" - -script: - - | - ( - set -Eeuo pipefail - set -x - docker build -t "$image" . - ~/official-images/test/run.sh "$image" - ) - -after_script: - - docker images - -# vim:set et ts=2 sw=2: diff --git a/README.md b/README.md index 029c6956c..df17a7821 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,12 @@ For outstanding `tomcat` image PRs, check [PRs with the "library/tomcat" label o --- -- [![build status badge](https://img.shields.io/travis/docker-library/tomcat/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/tomcat/branches) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/tomcat.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/tomcat) +- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/tomcat/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/tomcat/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/tomcat.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/tomcat/) | 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/tomcat.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/tomcat) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/tomcat.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/tomcat) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/tomcat.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/tomcat) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/tomcat.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/tomcat) | -| [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/tomcat.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/tomcat) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/tomcat.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/tomcat) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/tomcat.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/tomcat/) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/tomcat.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/tomcat/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/tomcat.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/tomcat/) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/tomcat.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/tomcat/) | +| [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/tomcat.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/tomcat/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/tomcat.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/tomcat/) | diff --git a/update.sh b/update.sh index 88cb53024..16b0cd0a6 100755 --- a/update.sh +++ b/update.sh @@ -111,7 +111,6 @@ versions=( "${versions[@]%/}" ) # sort version numbers with lowest first IFS=$'\n'; versions=( $(sort -V <<<"${versions[*]}") ); unset IFS -travisEnv= for version in "${versions[@]}"; do majorVersion="${version%%.*}" @@ -204,11 +203,6 @@ for version in "${versions[@]}"; do -e 's/^(ENV GPG_KEYS) .*/\1 '"${versionGpgKeys[*]}"'/' \ "Dockerfile-$template.template" \ > "$vendorDir/Dockerfile" - - travisEnv='\n - '"CONTEXT=$vendorDir$travisEnv" done done done - -travis="$(awk -v 'RS=\n\n' -v travisEnv="$travisEnv" '$1 == "env:" { $0 = "env:" travisEnv } { printf "%s%s", $0, RS }' .travis.yml)" -cat <<<"$travis" > .travis.yml