Merge pull request #187 from firebase/feature/js-fix-include-path-in-package

Switch Mac build to Xcode 11.7, and fix final C++ package include path.

Author: jonsimantov

.github/workflows/cpp-packaging.yml

@@ -19,11 +19,14 @@ on:
 env:
   # Packaging prerequisites
   # Binutils 2.35.1 released Sep 19, 2020
-  binutilsVer: 2.35.1
+  binutilsVer: "2.35.1"
   # Demumble 1.1.0 released Nov 13, 2018
-  demumbleVer: 1.1.0
+  demumbleVer: "1.1.0"
   # Use SHA256 for hashing files.
-  hashCommand: sha256sum
+  hashCommand: "sha256sum"
+  # Xcode version 11.7 is the version we build the SDK with.
+  # Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
+  xcodeVersion: "11.7"
 
 jobs:
   log_inputs:
@@ -64,6 +67,10 @@ jobs:
         - os: macos-latest
           tools_platform: darwin
     steps:
+      - name: setup Xcode version (macos)
+        if: runner.os == 'macOS'
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
+
       - name: fetch and build binutils
         run: |
           set +e
@@ -120,6 +127,10 @@ jobs:
     runs-on: macos-latest
     if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
     steps:
+      - name: setup Xcode version (macos)
+        if: runner.os == 'macOS'
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
+
       - name: fetch SDK
         uses: actions/[email protected]
         with:
@@ -247,6 +258,10 @@ jobs:
           build_type: "Debug"
 
     steps:
+      - name: setup Xcode version (macos)
+        if: runner.os == 'macOS'
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
+
       - uses: actions/checkout@v2
         with:
           submodules: true
@@ -367,6 +382,10 @@ jobs:
         - sdk_platform: darwin
           runs_on_platform: ubuntu-latest
     steps:
+      - name: setup Xcode version (macos)
+        if: runner.os == 'macOS'
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
+
       - name: fetch SDK
         uses: actions/[email protected]
         with:
@@ -588,6 +607,10 @@ jobs:
     if: always()
     runs-on: ubuntu-latest
     steps:
+      - name: setup Xcode version (macos)
+        if: runner.os == 'macOS'
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
+
       - name: download SDK zip
         uses: actions/download-artifact@v2
         with:

.github/workflows/desktop.yml

@@ -6,6 +6,9 @@ on:
 
 env:
   CCACHE_DIR: ${{ github.workspace }}/ccache_dir
+  # Xcode version 11.7 is the version we build the SDK with.
+  # Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
+  xcodeVersion: "11.7"
 
 jobs:
   build:
@@ -40,6 +43,10 @@ jobs:
           msvc_runtime: "dynamic"
 
     steps:
+      - name: setup Xcode version (macos)
+        if: runner.os == 'macOS'
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
+
       - uses: actions/checkout@v2
         with:
           submodules: true

.github/workflows/ios.yml

@@ -4,6 +4,11 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
 
+env:
+  # Xcode version 11.7 is the version we build the SDK with.
+  # Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
+  xcodeVersion: "11.7"
+
 jobs:
   build:
     name: ios-macos-latest
@@ -12,6 +17,10 @@ jobs:
       fail-fast: false
 
     steps:
+      - name: setup Xcode version (macos)
+        if: runner.os == 'macOS'
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
+
       - uses: actions/checkout@v2
         with:
           submodules: true

build_scripts/other/package.sh

@@ -27,8 +27,8 @@ cd "${origpath}"
 # Copy headers to packaged SDK.
 mkdir -p "${destpath}/include"
 cd "${sdkpath}"
-for incdir in */src/include/; do
-    cp -af "${incdir}" "${destpath}/include/"
+for incdir in */src/include; do
+    cp -af "${incdir}" "${destpath}/"
 done
 cd "${origpath}"