Skip to content

Commit

Permalink
revert changes to non-R tasks and update events
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb committed May 30, 2020
1 parent 5bf6ee5 commit e92b324
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ source activate $CONDA_ENV

cd $BUILD_DIRECTORY

if [[ $TASK == "check-docs" ]]; then
if [[ $TRAVIS == "true" ]] && [[ $TASK == "check-docs" ]]; then
cd $BUILD_DIRECTORY/docs
conda install -q -y -n $CONDA_ENV -c conda-forge doxygen
pip install --user -r requirements.txt rstcheck
Expand All @@ -40,7 +40,7 @@ if [[ $TASK == "check-docs" ]]; then
exit 0
fi

if [[ $TASK == "lint" ]]; then
if [[ $TRAVIS == "true" ]] && [[ $TASK == "lint" ]]; then
conda install -q -y -n $CONDA_ENV \
pycodestyle \
pydocstyle \
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: GitHub Actions

on: [push]
on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
test:
Expand Down

0 comments on commit e92b324

Please sign in to comment.