From 83858dfd8327e08d28c5907374fb9de7e48e9e1b Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 12 Feb 2021 10:21:38 +0100
Subject: [PATCH 1/2] Move startup test to github workflow

This times out a lot on circle-ci recently.
---
 .circleci/config.yml                 | 13 ----------
 .github/workflows/first_startup.yaml | 36 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/first_startup.yaml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8d5b9335bc3..f099c20288b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,17 +100,6 @@ jobs:
       - *install_tox
       - *install_ffprobe
       - run: tox -e py35-unit
-  py35_first_startup:
-    docker:
-      - image: circleci/python:3.5
-    <<: *set_workdir
-    steps:
-      - *restore_repo_cache
-      # Use this job to test the latest migrations
-      - run: wget -q https://github.com/jmchilton/galaxy-downloads/raw/master/db_gx_rev_0141.sqlite
-      - run: mv db_gx_rev_0141.sqlite database/universe.sqlite
-      - *install_tox
-      - run: tox -e py35-first_startup
   validate_test_tools:
     docker:
       - image: circleci/python:3.5
@@ -163,8 +152,6 @@ workflows:
           <<: *requires_get_code
       - py35_unit:
           <<: *requires_get_code
-      - py35_first_startup:
-          <<: *requires_get_code
       - test_galaxy_packages:
           <<: *requires_get_code
       - validate_test_tools:
diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml
new file mode 100644
index 00000000000..00cec104175
--- /dev/null
+++ b/.github/workflows/first_startup.yaml
@@ -0,0 +1,36 @@
+name: first startup
+on: [push, pull_request]
+jobs:
+
+  test:
+    name: Startup test
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.5']
+    defaults:
+      run:
+        shell: bash -l {0}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        path: 'galaxy root'
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - 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
+      # Use this job to test the latest migrations
+    - run: wget -q https://github.com/jmchilton/galaxy-downloads/raw/master/db_gx_rev_0141.sqlite
+    - run: mv db_gx_rev_0141.sqlite 'galaxy root'/database/universe.sqlite
+    - name: run tests
+      run: tox -e first_startup
+      working-directory: 'galaxy root'

From 548602ccbfd60a4d0c480e1195c5cc98e6840bec Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 12 Feb 2021 10:56:37 +0100
Subject: [PATCH 2/2] Use the correct pip cache

---
 .github/workflows/first_startup.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml
index 00cec104175..4d91098d62e 100644
--- a/.github/workflows/first_startup.yaml
+++ b/.github/workflows/first_startup.yaml
@@ -23,9 +23,8 @@ jobs:
       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') }}
+        path: ~/.cache/pip
+        key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('galaxy root/requirements.txt') }}
     - name: Install tox
       run: pip install tox
       # Use this job to test the latest migrations