You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by fg...@apache.org on 2022/01/17 11:22:53 UTC

[nifi-minifi-cpp] 03/04: MINIFICPP-1723 Use newer macos and xcode in github actions

This is an automated email from the ASF dual-hosted git repository.

fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit faa370d28f721c91f9f802b15bc32f6693dfe74d
Author: Marton Szasz <sz...@apache.org>
AuthorDate: Tue Jan 11 16:36:45 2022 +0100

    MINIFICPP-1723 Use newer macos and xcode in github actions
    
    Signed-off-by: Ferenc Gerlits <fg...@gmail.com>
    
    This closes #1239
---
 .github/workflows/ci.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a3da1a..7cb2b51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,9 @@
 name: "MiNiFi-CPP CI"
 on: [push, pull_request, workflow_dispatch]
 jobs:
-  macos_xcode_12_0:
-    name: "macos-xcode12.0"
-    runs-on: macos-10.15
+  macos_xcode:
+    name: "macos-xcode"
+    runs-on: macos-11
     timeout-minutes: 90
     env:
       CCACHE_BASEDIR: ${{ GITHUB.WORKSPACE }}
@@ -15,10 +15,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.CCACHE_DIR }}
-          key: macos-xcode12.0-ccache-${{github.ref}}-${{github.sha}}
+          key: macos-xcode-ccache-${{github.ref}}-${{github.sha}}
           restore-keys: |
-            macos-xcode12.0-ccache-${{github.ref}}-
-            macos-xcode12.0-ccache-refs/heads/main-
+            macos-xcode-ccache-${{github.ref}}-
+            macos-xcode-ccache-refs/heads/main-
       - id: install_dependencies
         run: |
           brew update
@@ -28,7 +28,8 @@ jobs:
         run: |
           echo "PATH=/usr/lib/ccache:/usr/local/opt/ccache/bin:/usr/local/opt/ccache/libexec:$PATH" >> $GITHUB_ENV
           echo -e "127.0.0.1\t$HOSTNAME" | sudo tee -a /etc/hosts > /dev/null
-          sudo xcode-select -switch /Applications/Xcode_12.app
+          # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
+          sudo xcode-select -switch /Applications/Xcode_13.2.1.app
       - name: build
         run: |
           export PATH="/usr/local/opt/flex/bin:$PATH"