Merge branch 'master' into 3.1

gwaldron · Dec 2, 2020 · 2b0ab5a · 2b0ab5a
2 parents 6206183 + a4cbd83
commit 2b0ab5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -1,10 +1,6 @@
 name: macosx-x64 
 
-on:
-  workflow_dispatch:
-    branches:
-      - master
-      - 3.1
+on: [push, pull_request, workflow_dispatch]
 
 env:             
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,10 +1,6 @@
 name: windows-x64-Release
 
-on:
-  workflow_dispatch:
-    branches:
-      - master
-      - 3.1
+on: [workflow_dispatch]
 
 env:             
   VCPKG_BINARY_SOURCES : 'clear;nuget,GitHub,readwrite'  
@@ -70,7 +66,7 @@ jobs:
       working-directory: ${{ matrix.VCPKG_WORKSPACE }}
       shell: 'bash'
       run: >
-        ./vcpkg/vcpkg install osg sqlite3 protobuf curl gdal --triplet ${{ matrix.triplet }} 
+        ./vcpkg/vcpkg install osg curl gdal geos sqlite3 protobuf basisu draco --triplet ${{ matrix.triplet }} 
 
     - name: 'Upload library build log artifact'
       uses: actions/upload-artifact@v2