From 1fffd2af2aebf4fec9058cf957c99f86e148d7bd Mon Sep 17 00:00:00 2001
From: Daniel McDonald <danielmcdonald@ucsd.edu>
Date: Tue, 29 Dec 2020 09:48:01 -0800
Subject: [PATCH 1/2] Setup actions

---
 .github/workflows/main.yml | 48 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..bddc235
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,48 @@
+name: microsetta-admin CI
+
+on: 
+  push:
+    branches: [ master ]
+  pull_request:
+    
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: flake8
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+    - name: install dependencies
+      run: python -m pip install --upgrade pip
+    - name: lint
+      run: |
+        pip install -q flake8
+        make lint
+        
+  build-and-test:
+    needs: lint
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: conda-incubator/setup-miniconda@v2
+      with:        
+        auto-update-conda: true
+        python-version: 3.6 
+    - name: Install dependencies
+      shell: bash -l {0}
+      run: |
+        conda create --name test-microsetta-public python=3.6
+        conda activate test-microsetta-public
+        conda install --yes --file ci/conda_requirements.txt
+        pip install -r ci/pip_requirements.txt
+        make install
+    - name: Tests
+      shell: bash -l {0}
+      run: |
+        conda activate test-microsetta-public
+        make test

From 3fcc74d05aa5d2593a3dc3b445e7043682b1cabd Mon Sep 17 00:00:00 2001
From: Daniel McDonald <danielmcdonald@ucsd.edu>
Date: Tue, 29 Dec 2020 10:08:58 -0800
Subject: [PATCH 2/2] py37

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bddc235..f9ab657 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     - name: flake8
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.7
     - name: install dependencies
       run: python -m pip install --upgrade pip
     - name: lint
@@ -32,11 +32,11 @@ jobs:
     - uses: conda-incubator/setup-miniconda@v2
       with:        
         auto-update-conda: true
-        python-version: 3.6 
+        python-version: 3.7 
     - name: Install dependencies
       shell: bash -l {0}
       run: |
-        conda create --name test-microsetta-public python=3.6
+        conda create --name test-microsetta-public python=3.7
         conda activate test-microsetta-public
         conda install --yes --file ci/conda_requirements.txt
         pip install -r ci/pip_requirements.txt