Commit 78ed45d55226ac666e1bb9c50411f28d036a7e83

Edward Thomson 2020-06-06T23:25:25

Update main.yml

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 723319b..d8c0355 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -65,7 +65,6 @@ jobs:
         - # macOS
           os: macos-latest
           pkg_config_path: /usr/local/opt/openssl/lib/pkgconfig
-          cmake_generator: Ninja
           cmake_options: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
           skip_ssh_tests: true
         - # Windows Visual Studio amd64
@@ -101,7 +100,7 @@ jobs:
       run: |
         if [ -n "${{ matrix.platform.image }}" ]; then
           docker login https://${{ env.foo }} -u ${{ github.actor }} -p ${{ github.token }}
-          docker pull ${{ env.foo }}/${{ env.platform.image }}:latest
+          docker pull ${{ env.foo }}/${{ matrix.platform.image }}:latest
           docker run ${{ env.foo }}/${{ matrix.platform.image }}:latest echo hi
         else
           mkdir build && cd build