Merge pull request #87 from firebase/fix-firestore

Get Windows build on GHA

Author: cynthiajoan

.github/workflows/android.yml

@@ -6,7 +6,7 @@ on:
     inputs:
       unity_version:
         description: 'Unity version'
-        default: '2019.4.30f1'
+        default: '2019.4.32f1'
         required: true
       firebase_cpp_sdk_version:
         description: 'Firebase CPP SDK version to build against (The branch, tag or SHA to checkout)'

.github/workflows/integration_tests.yml

@@ -8,7 +8,7 @@ on:
     inputs:
       unity_versions:
         description: 'Unity version'
-        default: '2019.4.30f1'
+        default: '2019.4.32f1'
         required: true
       platforms:
         description: 'CSV of Android,iOS,Windows,macOS,Linux'

.github/workflows/ios.yml

@@ -7,7 +7,7 @@ on:
       # Which version of Unity to use
       unity_version:
         description: 'Unity version'
-        default: '2019.4.30f1'
+        default: '2019.4.32f1'
         required: true
       firebase_cpp_sdk_version:
         description: 'Firebase CPP SDK version to build against (The branch, tag or SHA to checkout)'

.github/workflows/sdk_build.yml

@@ -6,12 +6,12 @@ on:
     inputs:
       # Which version of Unity to use
       unity_version:
-        description: 'Unity version'
-        default: '2019.4.30f1'
+        description: 'Unity version [2017.4.40f1, 2018.4.36f1, 2019.4.32f1, 2020.3.22f1]'
+        default: '2019.4.32f1'
         required: true
       # Linux uses a different number for its versions
       linux_unity_version:
-        description: 'Linux Unity version'
+        description: 'Linux Unity version [2017.4.10f1, 2018.4.36f1, 2019.4.32f1, 2020.3.22f1]'
         default: '2019.4.32f1'
         required: true
       # Additional CMake flags to use
@@ -22,12 +22,12 @@ on:
 
 jobs:
   build_desktop:
-    name: build-desktop-${{matrix.os}}
+    name: build-desktop-${{matrix.os}}-${{matrix.unity_version}}
     runs-on: ${{matrix.os}}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [windows-latest, macos-latest, ubuntu-latest]
         include:
         - os: macos-latest
           unity_version: ${{ github.event.inputs.unity_version }}
@@ -36,7 +36,7 @@ jobs:
           unity_platform_name: macOS,iOS
         - os: windows-latest
           unity_version: ${{ github.event.inputs.unity_version }}
-          unity_install_dir: TBD
+          unity_install_dir: /c/Program Files/Unity_${{ github.event.inputs.unity_version }}
           build_dir: windows_unity
           unity_platform_name: Windows
         - os: ubuntu-latest
@@ -60,11 +60,29 @@ jobs:
           path: firebase-cpp-sdk
           submodules: true
 
+      - name: Support longpaths
+        if: startsWith(matrix.os, 'windows')
+        run: git config --system core.longpaths true
+
+      # Set up the requirements, and install Unity
+      # Ruby setup has to happen before python install and setup, to keep the absl config.
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0.2
+
+      - name: Install Unity installer (U3D)
+        shell: bash
+        run: gem install u3d
+
       - name: Setup python
         uses: actions/setup-python@v2
         with:
           python-version: '3.7'
 
+      - name: Add msbuild to PATH (windows)
+        if: startsWith(matrix.os, 'windows')
+        uses: microsoft/[email protected]
+
       - name: Install prerequisites
         shell: bash
         run: |
@@ -73,37 +91,42 @@ jobs:
           python scripts/gha/install_prereqs_desktop.py
           cd ..
 
-      # Set up the requirements, and install Unity
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-      - name: Install Unity installer (U3D)
-        shell: bash
-        run: gem install u3d
       - name: Install python deps
         shell: bash
         run: |
           pip install -r scripts/gha/requirements.txt
-      - name: Install Unity
-        shell: bash
-        run: |
-          python scripts/gha/unity_installer.py --install --platforms ${{ matrix.unity_platform_name }} --version ${{ matrix.unity_version }}
-      - name: Setup Unity path
-        shell: bash
+
+      - name: Install OpenSSL (Windows)
+        if: startsWith(matrix.os, 'windows')
         run: |
-          echo "UNITY_ROOT_DIR=${{ matrix.unity_install_dir }}" >> $GITHUB_ENV
+          choco install openssl -r
 
       - name: Install OpenSSL (Linux)
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           sudo apt install openssl
+
       - name: Install OpenSSL (macOS)
         if: startsWith(matrix.os, 'macos')
         run: |
           brew install openssl
           # brew won't overwrite MacOS system default OpenSSL, so force it here.
           echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl --installed)" >> $GITHUB_ENV
 
+      - name: Install Unity
+        shell: bash
+        run: |
+          u3d available -u ${{ matrix.unity_version }} -p
+          python scripts/gha/unity_installer.py --install --platforms ${{ matrix.unity_platform_name }} --version ${{ matrix.unity_version }}
+
+      - name: Setup Unity path
+        shell: bash
+        run: |
+          echo "UNITY_ROOT_DIR=${{ matrix.unity_install_dir }}" >> $GITHUB_ENV
+          echo "$(swig -swiglib)" >> $GITHUB_PATH
+          swig -swiglib
+          echo "SWIG_DIR=$(swig -swiglib)" >> $GITHUB_ENV
+
       - name: Build SDK (Linux)
         if: startsWith(matrix.os, 'ubuntu')
         shell: bash
@@ -120,7 +143,19 @@ jobs:
         if: startsWith(matrix.os, 'windows')
         shell: bash
         run: |
-          ./build_windows_x64.bat
+          # ./build_windows_x64.bat ${{ github.event.inputs.additional_cmake_flags }} TODO convert to python script
+          mkdir ${{ matrix.build_dir }}
+          pushd ${{ matrix.build_dir }}
+          cmake .. -G "Visual Studio 16 2019" -A x64 -DFIREBASE_CPP_SDK_DIR="${FIREBASE_CPP_SDK_DIR}" -DUNITY_ROOT_DIR="${{ matrix.unity_install_dir }}" -DSWIG_DIR="$(swig -swiglib)" ${{ github.event.inputs.additional_cmake_flags }}
+          echo "=-=-=-=-=-=-=-=-="
+          echo "Start Build"
+          echo "=-=-=-=-=-=-=-=-="
+          cmake --build .  --config Release
+          echo "=-=-=-=-=-=-=-=-="
+          echo "Start Package"
+          echo "=-=-=-=-=-=-=-=-="
+          cpack .
+          popd
 
       - name: Upload Build
         uses: actions/upload-artifact@v2

CMakeLists.txt

@@ -207,11 +207,6 @@ if(NOT EXISTS ${FIREBASE_CPP_SDK_DIR})
   ${FIREBASE_CPP_SDK_DIR}. See the readme.md for more information")
 endif()
 
-if(MSVC AND NOT EXISTS ${MONO_DIR})
-  message(FATAL_ERROR "Mono directory doesn't exist: \
-  ${MONO_DIR}. See the readme.md for more information")
-endif()
-
 # Add the Firebase libraries to the target using the function from the SDK.
 add_subdirectory(${FIREBASE_CPP_SDK_DIR} bin/ EXCLUDE_FROM_ALL)
 

cmake/external_rules.cmake

@@ -62,7 +62,11 @@ function(download_external_sources)
 
   execute_process(
     COMMAND
-      ${ENV_COMMAND} cmake
+      ${ENV_COMMAND} cmake --debug-output
+      -G ${CMAKE_GENERATOR}
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+      -DPLATFORM=${PLATFORM}
+      -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
       -DCMAKE_INSTALL_PREFIX=${FIREBASE_INSTALL_DIR}
       -DFIREBASE_CPP_GIT_REPO=${FIREBASE_CPP_GIT_REPO}
       -DFIREBASE_DOWNLOAD_DIR=${FIREBASE_DOWNLOAD_DIR}

cmake/unity_mono.cmake

@@ -100,9 +100,14 @@ macro(mono_add_external_library name projpath)
     set(absprojpath ${CMAKE_CURRENT_LIST_DIR}/${projpath})
   endif()
 
+  set(CSHARP_BUILD_EXE "${UNITY_CSHARP_BUILD_EXE}")
+  if(MSVC)
+    set(CSHARP_BUILD_EXE "${MONO_CSHARP_BUILD_EXE}")
+  endif()
+
   add_custom_command(
     COMMAND
-      ${UNITY_CSHARP_BUILD_EXE}
+      ${CSHARP_BUILD_EXE}
       /p:AllowUnsafeBlocks=true
       /p:Configuration=Release
       /p:OutDir="${outdir}/"
@@ -116,7 +121,7 @@ macro(mono_add_external_library name projpath)
     OUTPUT
       ${outdir}/${DLL_NAME}.dll
     COMMENT
-      "Building csproj for ${DLL_NAME}.dll"
+      "Building csproj for ${DLL_NAME}.dll with ${CSHARP_BUILD_EXE}"
   )
 
   set_target_properties(${name} PROPERTIES

cmake/unity_pack.cmake

@@ -156,7 +156,6 @@ function(unity_pack_cs name)
 
   string(REPLACE ".dll" "" dllbasename ${dllname})
   string(REPLACE ".dll" "" dllbaserename ${dllrename})
-
   # Dll file
   install(
     FILES "${dllpath}/${dllname}"

scripts/gha/print_matrix_configuration.py

@@ -52,7 +52,7 @@
 PARAMETERS = {
   "integration_tests": {
     "matrix": {
-      "unity_version": ["2019.4.30f1"],
+      "unity_version": ["2019.4.32f1"],
       "android_device": ["android_target", "emulator_target"],
       "ios_device": ["ios_target", "simulator_target"],
 
@@ -62,7 +62,7 @@
       },
 
       EXPANDED_KEY: {
-        "unity_version": ["2020.3.19f1", "2019.4.30f1", "2018.4.36f1", "2017.4.40f1"],
+        "unity_version": ["2020.3.22f1", "2019.4.32f1", "2018.4.36f1", "2017.4.40f1", "2017.4.10f1"],
         "android_device": ["android_target", "android_latest", "emulator_target", "emulator_latest", "emulator_32bit"],
         "ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"],
       }
@@ -79,11 +79,11 @@
 # To list avaliable packages, install u3d, and use cmd "u3d available -u $unity_version -p"
 # The packages below is valid only if Unity Hub is not installed.
 UNITY_PACKAGES = {
-  "2020.3.19f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]},
-  "2019.4.30f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]},
-  "2019.4.32f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["linux-il2cpp"]},
-  "2018.4.36f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux"]},
-  "2017.4.40f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows"], "macOS": None, "Linux": ["Linux"]}
+  "2020.3.22f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-il2cpp"], "macOS": None, "Linux": ["linux-il2cpp"]},
+  "2019.4.32f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["windows-il2cpp"], "macOS": None, "Linux": ["linux-il2cpp"]},
+  "2018.4.36f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-il2cpp"], "macOS": None, "Linux": None},
+  "2017.4.40f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": None, "macOS": None, "Linux": None},
+  "2017.4.10f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows"], "macOS": None, "Linux": None} # For Linux Special
 }
 
 TEST_DEVICES = {

scripts/gha/unity_installer.py

@@ -171,7 +171,7 @@ def install_unity(unity_version, platforms):
        "--verbose", unity_version,
        "-p", package_csv])
   # This will list what u3d has installed. For debugging purposes.
-  run([u3d, "list"])
+  # run([u3d, "list"]) TODO sort out the crash issue.
   logging.info("Finished installing Unity.")