diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..155ef3165b --- /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 74a6719956..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,71 +0,0 @@ -language: bash -services: docker - -env: - - VERSION=8.0-rc VARIANT=buster/cli - - VERSION=8.0-rc VARIANT=buster/apache - - VERSION=8.0-rc VARIANT=buster/fpm - - VERSION=8.0-rc VARIANT=buster/zts - - VERSION=8.0-rc VARIANT=alpine3.12/cli - - VERSION=8.0-rc VARIANT=alpine3.12/fpm - - VERSION=7.4 VARIANT=buster/cli - - VERSION=7.4 VARIANT=buster/apache - - VERSION=7.4 VARIANT=buster/fpm - - VERSION=7.4 VARIANT=buster/zts - - VERSION=7.4 VARIANT=alpine3.12/cli - - VERSION=7.4 VARIANT=alpine3.12/fpm - - VERSION=7.4 VARIANT=alpine3.12/zts - - VERSION=7.4 VARIANT=alpine3.11/cli - - VERSION=7.4 VARIANT=alpine3.11/fpm - - VERSION=7.4 VARIANT=alpine3.11/zts - - VERSION=7.3 VARIANT=buster/cli - - VERSION=7.3 VARIANT=buster/apache - - VERSION=7.3 VARIANT=buster/fpm - - VERSION=7.3 VARIANT=buster/zts - - VERSION=7.3 VARIANT=stretch/cli - - VERSION=7.3 VARIANT=stretch/apache - - VERSION=7.3 VARIANT=stretch/fpm - - VERSION=7.3 VARIANT=stretch/zts - - VERSION=7.3 VARIANT=alpine3.12/cli - - VERSION=7.3 VARIANT=alpine3.12/fpm - - VERSION=7.3 VARIANT=alpine3.12/zts - - VERSION=7.3 VARIANT=alpine3.11/cli - - VERSION=7.3 VARIANT=alpine3.11/fpm - - VERSION=7.3 VARIANT=alpine3.11/zts - - VERSION=7.2 VARIANT=buster/cli - - VERSION=7.2 VARIANT=buster/apache - - VERSION=7.2 VARIANT=buster/fpm - - VERSION=7.2 VARIANT=buster/zts - - VERSION=7.2 VARIANT=stretch/cli - - VERSION=7.2 VARIANT=stretch/apache - - VERSION=7.2 VARIANT=stretch/fpm - - VERSION=7.2 VARIANT=stretch/zts - - VERSION=7.2 VARIANT=alpine3.12/cli - - VERSION=7.2 VARIANT=alpine3.12/fpm - - VERSION=7.2 VARIANT=alpine3.12/zts - - VERSION=7.2 VARIANT=alpine3.11/cli - - VERSION=7.2 VARIANT=alpine3.11/fpm - - VERSION=7.2 VARIANT=alpine3.11/zts - -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 "$VERSION/$VARIANT" - - slash='/'; image="php:${VERSION}-${VARIANT//$slash/-}" - -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 b143e31fdb..ca06b717a2 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ For outstanding `php` image PRs, check [PRs with the "library/php" label on the --- -- [![build status badge](https://img.shields.io/travis/docker-library/php/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/php/branches) +- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/php/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/php/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/php.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/php/) | Build | Status | Badges | (per-arch) | diff --git a/update.sh b/update.sh index 3b7b4ab1ed..a62ae6fd48 100755 --- a/update.sh +++ b/update.sh @@ -45,7 +45,6 @@ generated_warning() { EOH } -travisEnv= for version in "${versions[@]}"; do rcVersion="${version%-rc}" @@ -258,17 +257,4 @@ for version in "${versions[@]}"; do entrypoint="$(dirname "$dockerfile")/docker-php-entrypoint" sed -i 's! php ! '"$cmd"' !g' "$entrypoint" done - - newTravisEnv= - for dockerfile in "${dockerfiles[@]}"; do - dir="${dockerfile%Dockerfile}" - dir="${dir%/}" - variant="${dir#$version}" - variant="${variant#/}" - newTravisEnv+='\n - VERSION='"$version VARIANT=$variant" - done - travisEnv="$newTravisEnv$travisEnv" done - -travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)" -echo "$travis" > .travis.yml