Merge pull request #36 from sarnold/fix-ci

update workflows
sarnold · Mar 26, 2022 · 5a50b15 · 5a50b15
2 parents 471a605 + dbd7359
commit 5a50b15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: ci
 
 on:
   workflow_dispatch:
-  # pull_request:
+  pull_request:
   push:
     branches:
       - master
@@ -86,6 +86,7 @@ jobs:
       - name:  Install and setup Linux packages
         if: runner.os == 'Linux'
         run: |
+          sudo apt-get -y -qq update
           if [ "${{ matrix.compiler }}" = "gcc" ]; then
             sudo apt-get install -y --no-install-recommends g++-${{ matrix.version }}-multilib
             echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   build:
@@ -17,13 +16,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-2019]
 
     steps:
     - uses: actions/checkout@v2
     - name: Add 64-bit mingw-w64 to the PATH
       run: |
         echo "c:/msys64/bin;c:/msys64/mingw64/bin" >> $GITHUB_PATH
+        which gcc
       if: startsWith(matrix.os, 'win')
 
     - name: build