diff options
| -rw-r--r-- | .github/actions/action.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build_test.yml | 9 | ||||
| -rwxr-xr-x | tools/travis-before-install.sh | 2 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 8 |
4 files changed, 7 insertions, 14 deletions
diff --git a/.github/actions/action.yml b/.github/actions/action.yml index 87eeb502b..43a7d0c7a 100644 --- a/.github/actions/action.yml +++ b/.github/actions/action.yml @@ -25,4 +25,4 @@ runs: - name: Test shell: bash run: ./tools/travis-test.sh - + diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index bdefe1bad..d38ae0934 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -6,7 +6,7 @@ defaults: run: shell: bash -env: +env: DOWNLOAD_OPENBLAS: 1 PYTHON_VERSION: 3.7 @@ -22,7 +22,7 @@ jobs: with: python-version: ${{ env.PYTHON_VERSION }} - uses: ./.github/actions - + basic: needs: smoke_test runs-on: ubuntu-latest @@ -41,7 +41,7 @@ jobs: debug: needs: smoke_test - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: USE_DEBUG: 1 steps: @@ -196,7 +196,6 @@ jobs: popd fi echo $PWD/pypy3/bin >> $GITHUB_PATH - + - uses: ./.github/actions - diff --git a/tools/travis-before-install.sh b/tools/travis-before-install.sh index 88f869a02..81737af89 100755 --- a/tools/travis-before-install.sh +++ b/tools/travis-before-install.sh @@ -9,7 +9,7 @@ free -m df -h ulimit -a -sudo apt install gfortran eatmydata libgfortran3 libgfortran5 +sudo apt install gfortran eatmydata libgfortran5 if [ "$USE_DEBUG" ] then diff --git a/tools/travis-test.sh b/tools/travis-test.sh index bd2229ee7..e9ddae61a 100755 --- a/tools/travis-test.sh +++ b/tools/travis-test.sh @@ -72,19 +72,13 @@ run_test() # file does not install correctly when Python's optimization level is set # to strip docstrings (see https://github.com/eliben/pycparser/issues/291). PYTHONOPTIMIZE="" $PIP install -r test_requirements.txt + DURATIONS_FLAG="--durations 10" if [ -n "$USE_DEBUG" ]; then export PYTHONPATH=$PWD export MYPYPATH=$PWD fi - # pytest aborts when running --durations with python3.6-dbg, so only enable - # it for non-debug tests. That is a cPython bug fixed in later versions of - # python3.7 but python3.7-dbg is not currently available on travisCI. - if [ -z "$USE_DEBUG" ]; then - DURATIONS_FLAG="--durations 10" - fi - if [ -n "$RUN_COVERAGE" ]; then COVERAGE_FLAG=--coverage fi |