Merge remote-tracking branch 'origin/master' into draco

PDAL · Nov 17, 2020 · 148749c · 148749c
2 parents 0101c08 + 0f9407a
commit 148749c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 19 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -1,7 +1,6 @@
 name: Alpine
 
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   build:

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -1,7 +1,6 @@
 name: Conda
 
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   build:
@@ -19,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - uses: goanpeca/setup-miniconda@v1
+    - uses: conda-incubator/setup-miniconda@v2
       with:
         channels: conda-forge
         auto-update-conda: true

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,8 +1,6 @@
 name: Docker
 
-on:
-  push:
-  workflow_dispatch:
+on: [push, pull_request, workflow_dispatch]
 
 # adapted from https://raw.githubusercontent.com/stefanprodan/podinfo/master/.github/workflows/release.yml
 #

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,7 +1,6 @@
 name: Docs
 
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   docs:

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -1,7 +1,6 @@
 name: Linux
 
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   build:
@@ -17,7 +16,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: goanpeca/setup-miniconda@v1
+    - uses: conda-incubator/setup-miniconda@v2
       with:
         channels: conda-forge
         auto-update-conda: true

diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -1,7 +1,6 @@
 name: OSX
 
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   build:
@@ -17,7 +16,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - uses: goanpeca/setup-miniconda@v1
+    - uses: conda-incubator/setup-miniconda@v2
       with:
         channels: conda-forge
         auto-update-conda: true

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -1,7 +1,6 @@
 name: Windows
 
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   build:
@@ -18,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: ilammy/msvc-dev-cmd@v1
-    - uses: goanpeca/setup-miniconda@v1
+    - uses: conda-incubator/setup-miniconda@v2
       with:
         channels: conda-forge
         auto-update-conda: true