Merge pull request #165 from MAAP-Project/develop

V2 merge and tag

Author: wildintellect

.github/workflows/trigger-gitlab.yml

@@ -25,24 +25,16 @@ jobs:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
 
-    - name: Extract branch name
-      shell: bash
-      # $GITHUB_HEAD_REF is the source branch name
-      # $GITHUB_BASE_REF is the PR destination branch
-      # If we want to test that tests pass on the destination branch (e.g. master and develop) after merge, we probably want to add `master` and `develop` to the list of branches to run the CI on `push` and not just `pull_request`
-      run: echo "##[set-output name=branch;]$(echo ${GITHUB_HEAD_REF#refs/heads/})"
-      id: extract_branch
-
     # Runs a set of commands using the runners shell
     - name: Trigger GitLab CI
       env:
         GITLAB_CI_TRIGGER_URL: ${{ secrets.GITLAB_CI_TRIGGER_URL }}
         GITLAB_CI_TRIGGER_TOKEN: ${{ secrets.GITLAB_CI_TRIGGER_TOKEN }}
       run: |
-        echo Running on ref ${GITHUB_REF##*/}
+        echo Running on ref ${{ github.head_ref || github.ref_name }}
         echo Trigger CI pipeline
         curl -X POST \
            -F token=${GITLAB_CI_TRIGGER_TOKEN} \
            -F "ref=master" \
-           -F "variables[GITHUB_REF]=${{ steps.extract_branch.outputs.branch }}" \
+           -F "variables[GITHUB_REF]=${{ github.head_ref || github.ref_name }}" \
            ${GITLAB_CI_TRIGGER_URL}

.gitignore

@@ -2,3 +2,4 @@
 build/
 .ipynb_checkpoints
 mosaic.json
+*.h5

CONTRIBUTING.md

@@ -47,7 +47,7 @@ Assuming you have `conda` installed, this is how you set up your fork for local
     $ conda create -n maap python=3.7
     $ conda activate maap
     $ cd maap-documentation/
-    $ pip install requirements.txt
+    $ pip install -r requirements.txt
 
 #### 4.  Create a branch for local development::