Skip to content

Commit

Permalink
Move scripts from .travis to .ci because they're also used by GitHub …
Browse files Browse the repository at this point in the history
…Actions
  • Loading branch information
hugovk committed Jan 8, 2020
1 parent 5e9336a commit 428b063
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/test-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
pip install wheel
sudo apt-get install -qq ruby-dev
PATH="$PATH:~/.local/bin"
.travis/after_success.sh
.ci/after_success.sh
env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
with:
path: ~/.cache/pip
key:
${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.travis/*.sh') }}
${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.ci/*.sh') }}
restore-keys: |
${{ matrix.os }}-${{ matrix.python-version }}-
Expand All @@ -46,7 +46,7 @@ jobs:
with:
path: ~/Library/Caches/pip
key:
${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.travis/*.sh') }}
${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/.ci/*.sh') }}
restore-keys: |
${{ matrix.os }}-${{ matrix.python-version }}-
Expand All @@ -61,7 +61,7 @@ jobs:
- name: Install Linux dependencies
if: startsWith(matrix.os, 'ubuntu')
run: |
.travis/install.sh
.ci/install.sh
- name: Install macOS dependencies
if: startsWith(matrix.os, 'macOS')
Expand All @@ -70,11 +70,11 @@ jobs:
- name: Build
run: |
.travis/build.sh
.ci/build.sh
- name: Test
run: |
.travis/test.sh
.ci/test.sh
- name: Upload errors
uses: actions/upload-artifact@v1
Expand All @@ -86,7 +86,7 @@ jobs:
- name: After success
if: success()
run: |
.travis/after_success.sh
.ci/after_success.sh
env:
MATRIX_OS: ${{ matrix.os }}
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@ install:
if [ "$LINT" == "true" ]; then
pip install tox
else
.travis/install.sh;
.ci/install.sh;
fi
script:
- |
if [ "$LINT" == "true" ]; then
tox -e lint
else
.travis/build.sh
.travis/test.sh
.ci/build.sh
.ci/test.sh
fi
after_success:
- |
if [ "$LINT" == "" ]; then
.travis/after_success.sh
.ci/after_success.sh
fi
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ global-exclude .git*
global-exclude *.pyc
global-exclude *.so
prune .azure-pipelines
prune .travis
prune .ci

0 comments on commit 428b063

Please sign in to comment.