diff --git a/.github/workflows/osx_startup.yaml b/.github/workflows/osx_startup.yaml new file mode 100644 index 00000000000..f59525e812b --- /dev/null +++ b/.github/workflows/osx_startup.yaml @@ -0,0 +1,28 @@ +name: OSX +on: [push, pull_request] +jobs: + + test: + name: Startup test + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + with: + path: 'galaxy root' + - name: Cache pip dir + uses: actions/cache@v1 + id: pip-cache + with: + path: ~/Library/Caches/pip + # scripts/common_startup.sh creates a conda env for Galaxy containing Python 3.6 + key: pip-cache-3.6-${{ hashFiles('galaxy root/requirements.txt') }} + - name: Install tox + run: pip install tox + - name: Install and activate miniconda # use this job to test using Python from a conda environment + uses: goanpeca/setup-miniconda@v1 + with: + activate-environment: '' + - name: run tests + run: tox -e first_startup + shell: bash -l {0} # need this to have CONDA_EXE set + working-directory: 'galaxy root' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0f690edec63..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -os: osx -# No version of Python is available via virtualenv on OS X workers, see https://github.com/travis-ci/travis-ci/issues/2312 -language: generic - -env: - - TOX_ENV=py27-first_startup - - TOX_ENV=py37-first_startup - -install: - - set -e - - pip install tox - - | - if [ "$TOX_ENV" == "py27-first_startup" ]; then - # Use this job to test the latest migrations - wget -q https://github.com/jmchilton/galaxy-downloads/raw/master/db_gx_rev_0141.sqlite - mv db_gx_rev_0141.sqlite database/universe.sqlite - elif [ "$TOX_ENV" == "py37-first_startup" ]; then - # There is now a pre-installed python3 on osx Travis workers, but use this job to test using a conda environment - MINICONDA_URL="https://repo.anaconda.com/miniconda" - MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" - curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}" - bash $MINICONDA_FILE -b - . ~/miniconda3/bin/activate - fi - -script: tox -e $TOX_ENV - -notifications: - email: false diff --git a/tox.ini b/tox.ini index 65f75359293..0757e8e992a 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ passenv = CI CONDA_EXE setenv = first_startup: GALAXY_PYTHON=python first_startup: GALAXY_CONFIG_DATABASE_AUTO_MIGRATE=true - py{35,36,37}-first_startup: GALAXY_VIRTUAL_ENV=.venv3 + py{35,36,37,38}-first_startup: GALAXY_VIRTUAL_ENV=.venv3 unit: GALAXY_VIRTUAL_ENV={envdir} unit: GALAXY_ENABLE_BETA_COMPRESSED_GENBANK_SNIFFING=1 mulled: GALAXY_TEST_INCLUDE_SLOW=1