diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..155ef31 --- /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 d23829f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -language: bash -services: docker - -env: - - VERSION=3.6 VARIANT= - - VERSION=3.6 VARIANT=slim - - VERSION=2.7 VARIANT= - - VERSION=2.7 VARIANT=slim - -install: - - git clone https://github.com/docker-library/official-images.git ~/official-images - -before_script: - - env | sort - - cd "$VERSION/$VARIANT" - - image="pypy:$VERSION${VARIANT:+-$VARIANT}" - -script: - - travis_retry 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 5fd3375..dad97d2 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,12 @@ For outstanding `pypy` image PRs, check [PRs with the "library/pypy" label on th --- -- [![build status badge](https://img.shields.io/travis/docker-library/pypy/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/pypy/branches) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/pypy.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/pypy) +- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/pypy/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/pypy/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/pypy.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/pypy/) | 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/pypy.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/pypy) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/pypy.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/pypy) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/pypy.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/pypy) | [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/pypy.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/pypy) | -| [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/pypy.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/pypy) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/pypy.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/pypy/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/pypy.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/pypy/) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/pypy.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/pypy/) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/pypy.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/pypy/) | +| [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/pypy.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/pypy/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/pypy.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/pypy/) | diff --git a/update.sh b/update.sh index 49c7748..4b5ef33 100755 --- a/update.sh +++ b/update.sh @@ -37,7 +37,6 @@ sed_escape_rhs() { echo "$@" | sed -e 's/[\/&]/\\&/g' | sed -e ':a;N;$!ba;s/\n/\\n/g' } -travisEnv= for version in "${versions[@]}"; do case "$version" in 3 | 3.*) cmd='pypy3'; base='buster' ;; @@ -122,9 +121,5 @@ for version in "${versions[@]}"; do -e 's!%%BASE%%!'"$base"'!g' \ -e 's!%%ARCH-CASE%%!'"$(sed_escape_rhs "$linuxArchCase")"'!g' \ "Dockerfile${variant:+-$variant}.template" > "$version/$variant/Dockerfile" - travisEnv='\n - VERSION='"$version VARIANT=$variant$travisEnv" done done - -travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)" -echo "$travis" > .travis.yml