From 2d4f71af05ce4fe0dd0aaebf9074d20c08c0966a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=A9nainn=20Woodsend?= Date: Wed, 15 Jun 2022 20:47:07 +0100 Subject: [PATCH 1/3] Move cross-architecture testing to GitHub Actions. --- .github/workflows/test.yml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63cecf2d..76d6863e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,8 +57,32 @@ jobs: ./scripts/coverage.sh bash <(curl -s https://codecov.io/bash) -X gcov + cross-arch: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + architecture: [ppc64le, s390x, aarch64, mips64le, arm/v5, 386] + steps: + - uses: actions/checkout@v2 + - run: git fetch --prune --unshallow + + # https://github.com/docker/setup-qemu-action + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + # https://github.com/docker/setup-buildx-action + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Test + run: | + docker run -v "$PWD:/io" --platform=linux/${{ matrix.architecture }} python bash -e -c ' + cd /io && pip install . pytest && pytest + ' + success: - needs: test + needs: [test, cross-arch] runs-on: ubuntu-latest name: test successful steps: From f7e66dc554378e91200ab8866c8766ff0951a8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=A9nainn=20Woodsend?= Date: Fri, 17 Jun 2022 21:32:58 +0100 Subject: [PATCH 2/3] Switch to musl docker base images. --- .github/workflows/test.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 76d6863e..05a8f499 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,7 +62,7 @@ jobs: strategy: fail-fast: false matrix: - architecture: [ppc64le, s390x, aarch64, mips64le, arm/v5, 386] + architecture: [ppc64le, s390x, aarch64, arm/v6, 386] steps: - uses: actions/checkout@v2 - run: git fetch --prune --unshallow @@ -77,8 +77,12 @@ jobs: - name: Test run: | - docker run -v "$PWD:/io" --platform=linux/${{ matrix.architecture }} python bash -e -c ' - cd /io && pip install . pytest && pytest + docker run -v "$PWD:/io" --platform=linux/${{ matrix.architecture }} python:alpine ash -e -c ' + apk add gcc g++ musl-dev git + cd /io + git config --global --add safe.directory /io + pip install . pytest + FORCE_COLOR=1 pytest ' success: From 3efb5ccde7402f4a342ec8161b5c8e18d7727ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=A9nainn=20Woodsend?= Date: Sat, 18 Jun 2022 18:12:38 +0100 Subject: [PATCH 3/3] Delete old TravisCI workflow and references. --- .travis.yml | 24 ------------------------ README.md | 1 - RELEASING.md | 4 +--- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b296fab7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: python -cache: pip - -arch: - - ppc64le - - arm64 - - s390x - -dist: focal - -# Only test oldest and newest supported versions -python: - - "3.7" - - "3.10" - -jobs: - fast_finish: true - -install: - - pip install -U pip - - pip install -U pytest - - pip install . - -script: pytest diff --git a/README.md b/README.md index 749e74cd..753aa585 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ [![Supported Python versions](https://img.shields.io/pypi/pyversions/ujson.svg?logo=python&logoColor=FFE873)](https://pypi.org/project/ujson) [![PyPI downloads](https://img.shields.io/pypi/dm/ujson.svg)](https://pypistats.org/packages/ujson) [![GitHub Actions status](https://github.com/ultrajson/ultrajson/workflows/Test/badge.svg)](https://github.com/ultrajson/ultrajson/actions) -[![Travis CI status](https://travis-ci.com/ultrajson/ultrajson.svg?branch=main)](https://app.travis-ci.com/github/ultrajson/ultrajson) [![codecov](https://codecov.io/gh/ultrajson/ultrajson/branch/main/graph/badge.svg)](https://codecov.io/gh/ultrajson/ultrajson) [![DOI](https://zenodo.org/badge/1418941.svg)](https://zenodo.org/badge/latestdoi/1418941) [![Code style: Black](https://img.shields.io/badge/code%20style-Black-000000.svg)](https://github.com/psf/black) diff --git a/RELEASING.md b/RELEASING.md index 1130b099..c657fe25 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,11 +1,9 @@ # Release Checklist - [ ] Get `main` to the appropriate code release state. - [GitHub Actions](https://github.com/ultrajson/ultrajson/actions) and - [Travis CI](https://app.travis-ci.com/github/ultrajson/ultrajson) should be running + [GitHub Actions](https://github.com/ultrajson/ultrajson/actions) should be running cleanly for all merges to `main`. [![GitHub Actions status](https://github.com/ultrajson/ultrajson/workflows/Test/badge.svg)](https://github.com/ultrajson/ultrajson/actions) - [![Build Status](https://app.travis-ci.com/ultrajson/ultrajson.svg?branch=main)](https://app.travis-ci.com/ultrajson/ultrajson) - [ ] Edit release draft, adjust text if needed: https://github.com/ultrajson/ultrajson/releases