diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 07d9f6b70..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: build-{build}.{branch} - -environment: - matrix: - - version: 3.9-rc - variant: windowsservercore-ltsc2016 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - version: 3.9-rc - variant: windowsservercore-1809 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - version: 3.8 - variant: windowsservercore-ltsc2016 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - version: 3.8 - variant: windowsservercore-1809 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - version: 3.7 - variant: windowsservercore-ltsc2016 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - version: 3.7 - variant: windowsservercore-1809 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - -install: - - ps: | - [Environment]::SetEnvironmentVariable('dockerImage', ('python:{0}' -f $env:version), [EnvironmentVariableTarget]::Process); - [Environment]::SetEnvironmentVariable('buildDirectory', ('{0}/windows/{1}' -f $env:version, $env:variant), [EnvironmentVariableTarget]::Process); - -build_script: - - cmd: appveyor-retry docker build --pull -t %dockerImage% %buildDirectory% - -after_build: - - ps: docker images - -test_script: - - cmd: docker run --rm %dockerImage% python --version - - cmd: docker run --rm %dockerImage% pip freeze --all 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 b290ccd9f..000000000 --- a/.travis.yml +++ /dev/null @@ -1,81 +0,0 @@ -language: bash -services: docker - -matrix: - include: - - os: linux - env: VERSION=3.9-rc VARIANT=buster - - os: linux - env: VERSION=3.9-rc VARIANT=alpine3.11 - - os: linux - env: VERSION=3.8 VARIANT=buster - - os: linux - env: VERSION=3.8 VARIANT=buster/slim - - os: linux - env: VERSION=3.8 VARIANT=alpine3.11 - - os: linux - env: VERSION=3.8 VARIANT=alpine3.10 - - os: linux - env: VERSION=3.7 VARIANT=buster - - os: linux - env: VERSION=3.7 VARIANT=buster/slim - - os: linux - env: VERSION=3.7 VARIANT=stretch - - os: linux - env: VERSION=3.7 VARIANT=stretch/slim - - os: linux - env: VERSION=3.7 VARIANT=alpine3.11 - - os: linux - env: VERSION=3.7 VARIANT=alpine3.10 - - os: linux - env: VERSION=3.6 VARIANT=buster - - os: linux - env: VERSION=3.6 VARIANT=buster/slim - - os: linux - env: VERSION=3.6 VARIANT=stretch - - os: linux - env: VERSION=3.6 VARIANT=stretch/slim - - os: linux - env: VERSION=3.6 VARIANT=alpine3.11 - - os: linux - env: VERSION=3.6 VARIANT=alpine3.10 - - os: linux - env: VERSION=3.5 VARIANT=buster - - os: linux - env: VERSION=3.5 VARIANT=buster/slim - - os: linux - env: VERSION=3.5 VARIANT=stretch - - os: linux - env: VERSION=3.5 VARIANT=stretch/slim - - os: linux - env: VERSION=3.5 VARIANT=alpine3.11 - - os: linux - env: VERSION=3.5 VARIANT=alpine3.10 - -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/$VARIANT" - - slash='/'; image="python:${VERSION}-${VARIANT//$slash/-}" - -script: - - | - ( - set -Eeuo pipefail - set -x - docker build -t "$image" . - if [ "$TRAVIS_OS_NAME" = 'windows' ]; then - # TODO make the tests run successfully on Windows too! - docker run --rm "$image" python --version - else - ~/official-images/test/run.sh "$image" - fi - ) - -after_script: - - docker images - -# vim:set et ts=2 sw=2: diff --git a/README.md b/README.md index 90ce3839f..df5b2bcea 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,13 @@ For outstanding `python` image PRs, check [PRs with the "library/python" label o --- -- [![build status badge](https://img.shields.io/travis/docker-library/python/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/python/branches) -- [![build status badge](https://img.shields.io/appveyor/ci/docker-library/python/master.svg?label=AppVeyor)](https://ci.appveyor.com/project/docker-library/python) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/python.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/python) +- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/python/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/python/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/python.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/python/) | 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/python.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/python) | [![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/python.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/python) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/python.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/python) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/python.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/python) | -| [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/python.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/python) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/python.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/python) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/python.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/python) | [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/python.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/python) | -| [![windows-amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/python.svg?label=windows-amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/python) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/heavy.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/heavy) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/python.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/python/) | [![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/python.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/python/) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/python.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/python/) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/python.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/python/) | +| [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/python.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/python/) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/python.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/python/) | [![mips64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/python.svg?label=mips64le)](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/python/) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/python.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/python/) | +| [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/python.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/python/) | [![windows-amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/python.svg?label=windows-amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/python/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/heavy.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/heavy/) | diff --git a/update.sh b/update.sh index 8dc86f475..291bbdc16 100755 --- a/update.sh +++ b/update.sh @@ -49,8 +49,6 @@ generated_warning() { EOH } -travisEnv= -appveyorEnv= for version in "${versions[@]}"; do rcVersion="${version%-rc}" rcGrepV='-v' @@ -178,25 +176,5 @@ for version in "${versions[@]}"; do # https://github.com/python/cpython/pull/14910 perl -0 -i -p -e "s![^\n]+PROFILE_TASK(='[^']+?')?[^\n]+\n!!gs" "$dir/Dockerfile" fi - - case "$v" in - # https://www.appveyor.com/docs/windows-images-software/ - windows/*-1809) - appveyorEnv='\n - version: '"$version"'\n variant: '"$variant"'\n APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019'"$appveyorEnv" - ;; - windows/*-ltsc2016) - appveyorEnv='\n - version: '"$version"'\n variant: '"$variant"'\n APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017'"$appveyorEnv" - ;; - - *) - travisEnv='\n - os: linux\n env: VERSION='"$version VARIANT=$v$travisEnv" - ;; - esac done done - -travis="$(awk -v 'RS=\n\n' '$1 == "matrix:" { $0 = "matrix:\n include:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)" -echo "$travis" > .travis.yml - -appveyor="$(awk -v 'RS=\n\n' '$1 == "environment:" { $0 = "environment:\n matrix:'"$appveyorEnv"'" } { printf "%s%s", $0, RS }' .appveyor.yml)" -echo "$appveyor" > .appveyor.yml