Swapped build_cmake.yml for current one from upstream

OpenChemistry · Nov 16, 2023 · 99c67e2 · 99c67e2
1 parent 70fc4a6
commit 99c67e2
Showing 1 changed file with 67 additions and 44 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -11,7 +11,13 @@ env:
   # this is different from MACOSX_DEPLOYMENT_TARGET to prevent build problems
   # we set MACOSX_DEPLOYMENT_TARGET later
   MACOS_TARGET: 10.12
-  FEATURES: -DBUILD_GPL_PLUGINS=ON -DWITH_COORDGEN=OFF -DUSE_VTK=ON
+  FEATURES: -DBUILD_GPL_PLUGINS=ON -DWITH_COORDGEN=OFF -DUSE_VTK=ON -DUSE_3DCONNEXION=ON
+  CACHE: -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+  SCCACHE_GHA_ENABLED: "true"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
@@ -26,15 +32,15 @@ jobs:
             os: ubuntu-latest,
             cc: "gcc", cxx: "g++",
             build_type: "Release",
-            cmake_flags: "-G Ninja -DENABLE_TESTING=ON -DTEST_QTGL=OFF",
+            cmake_flags: "-G Ninja -DENABLE_TESTING=ON -DTEST_QTGL=OFF -USE_SYSTEM_ZLIB=ON",
             cpack: "",
           }
         - {
             name: "Ubuntu AppImage", artifact: "Avogadro2.AppImage",
             os: ubuntu-20.04,
             cc: "gcc", cxx: "g++",
             build_type: "Release",
-            cmake_flags: "-G Ninja -DINSTALL_BUNDLE_FILES=ON",
+            cmake_flags: "-G Ninja -DINSTALL_BUNDLE_FILES=ON -USE_SYSTEM_ZLIB=ON",
             cpack: "",
           }
         - {
@@ -50,40 +56,24 @@ jobs:
             os: windows-latest,
             cc: "cl", cxx: "cl",
             build_type: "Release",
-            cmake_flags: "",
+            cmake_flags: "-DOPENSSL_ROOT_DIR=D:\\a\\Tools\\OpenSSL\\Win_x64",
             build_flags: "-j 2",
             cpack_flags: "-G NSIS",
           }
         - {
             name: "Ubuntu Address Sanitizer", artifact: "",
-            os: ubuntu-latest,
+            os: ubuntu-20.04,
             cc: "gcc", cxx: "g++",
             build_type: "asan",
-            cmake_flags: "-G Ninja -DENABLE_TESTING=ON -DTEST_QTGL=OFF",
-            cpack: "",
-          }
-        - {
-            name: "Ubuntu Leak Sanitizer", artifact: "",
-            os: ubuntu-latest,
-            cc: "gcc", cxx: "g++",
-            build_type: "lsan",
-            cmake_flags: "-G Ninja -DENABLE_TESTING=ON -DTEST_QTGL=OFF",
-            cpack: "",
-          }
-        - {
-            name: "Ubuntu Thread Sanitizer", artifact: "",
-            os: ubuntu-latest,
-            cc: "gcc", cxx: "g++",
-            build_type: "tsan",
-            cmake_flags: "-G Ninja -DENABLE_TESTING=ON -DTEST_QTGL=OFF",
+            cmake_flags: "-G Ninja -DENABLE_TESTING=ON -DTEST_QTGL=OFF -USE_SYSTEM_ZLIB=ON",
             cpack: "",
           }
         - {
             name: "Ubuntu Undefined Behavior Sanitizer", artifact: "",
-            os: ubuntu-latest,
+            os: ubuntu-20.04,
             cc: "gcc", cxx: "g++",
             build_type: "ubsan",
-            cmake_flags: "-G Ninja -DENABLE_TESTING=ON -DTEST_QTGL=OFF",
+            cmake_flags: "-G Ninja -DENABLE_TESTING=ON -DTEST_QTGL=OFF -USE_SYSTEM_ZLIB=ON",
             cpack: "",
           }
 
@@ -95,6 +85,7 @@ jobs:
         sudo apt-get -qq update
         sudo apt-get -qq install ninja-build libeigen3-dev libboost-all-dev libglew-dev libxml2-dev 
         sudo apt-get -qq install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5x11extras5-dev libqt5svg5-dev
+        sudo apt-get -qq install libgcc-10-dev libgcc-9-dev
     - name: Install Dependencies (macOS)
       if: runner.os == 'macOS'
       run: |
@@ -108,27 +99,50 @@ jobs:
       run: choco install ninja
 
     - name: Checkout openchemistry
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: openchemistry/openchemistry
         submodules: recursive
 
     - name: Checkout avogadroapp
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: openchemistry/avogadroapp
         path: avogadroapp
 
+    - name: Checkout molecules
+      uses: actions/checkout@v4
+      with:
+        repository: openchemistry/molecules
+        path: molecules
+
+    - name: Checkout i18n
+      uses: actions/checkout@v4
+      with:
+        repository: openchemistry/avogadro-i18n
+        path: avogadro-i18n
+
     - name: Checkout avogadrolibs
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: avogadrolibs
 
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        cache: true
+        cache: True
+        version: ${{ env.QT_VERSION }}
+
+    - name: Install OpenSSL (Win64)
+      if: runner.os == 'Windows'
+      uses: jurplel/install-qt-action@v3
+      with:
+        cache: True
+        tools: 'tools_opensslv3_x64'
         version: ${{ env.QT_VERSION }}
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2019_64'
 
     - name: Configure MSVC Command Prompt
       if: runner.os == 'Windows'
@@ -141,22 +155,24 @@ jobs:
       if: runner.os != 'Windows'
       with:
         path: |
-          ${{ runner.workspace }}/build/thirdparty
           ${{ runner.workspace }}/build/Downloads
-        key: ${{ matrix.config.name }}-thirdparty
+        key: ${{ matrix.config.name }}-downloads
+
+    - name: Run sccache-cache
+      uses: mozilla-actions/sccache-action@main
 
     - name: Configure
       run: |
         if [ ! -d "${{ runner.workspace }}/build" ]; then mkdir "${{ runner.workspace }}/build"; fi
         cd "${{ runner.workspace }}/build"
         # won't have any effect except on Mac
         echo "MACOSX_DEPLOYMENT_TARGET=${{ env.MACOS_TARGET }}" >> $GITHUB_ENV
-        CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} cmake $GITHUB_WORKSPACE ${{env.FEATURES}} -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} ${{matrix.config.cmake_flags}}
+        CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} cmake $GITHUB_WORKSPACE ${{env.FEATURES}} ${{env.CACHE}} -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} ${{matrix.config.cmake_flags}}
       shell: bash
 
     - name: Build
       run: |
-        CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} cmake --build . --config ${{matrix.config.build_type}} ${{matrix.config.build_flags}}
+        CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} CMAKE_C_COMPILER_LAUNCHER=sccache CMAKE_CXX_COMPILER_LAUNCHER=sccache cmake --build . --config ${{matrix.config.build_type}} ${{matrix.config.build_flags}}
       shell: bash
       working-directory: ${{ runner.workspace }}/build
 
@@ -181,9 +197,18 @@ jobs:
         done
         otool -L libinchi.?.?.?.dylib
         cp -p libinchi* ../Avogadro2.app/Contents/Frameworks/
+        # finally, fixup the binaries
+        #cd ../bin
+        #for exe in obabel obmm eht_bind genXrdPattern; do
+        #  for libpath in `otool -L ${exe} | grep '/Users/runner/work' | awk '{print $1}'`; do 
+        #    export lib=`echo $libpath | cut -d '/' -f 9`;
+        #    echo "Fixing $exe $lib $libpath"
+        #    install_name_tool -change $libpath @executable_path/../Frameworks/$lib $exe
+        #  done
+        #done
 
     - name: Run tests
-      if: matrix.config.os == 'ubuntu-latest'
+      if: matrix.config.os == 'ubuntu-20.04'
       shell: cmake -P {0}
       run: |
         include(ProcessorCount)
@@ -234,21 +259,22 @@ jobs:
           fi # certificate exists
         fi # password exists
 
-    - name: Pack
-      if: matrix.config.artifact != 0
+    - name: Create Mac and Windows Packages
+      if: matrix.config.os == 'windows-latest' || matrix.config.os == 'macos-latest'
       shell: bash
       run: |
         if [ -z "${P12_PASSWORD}" ]; then
           unset CODESIGN_IDENTITY # to prevent cpack failing when trying to sign
         fi
+        [[ ! "${GITHUB_REF}" =~ "tags" ]] && export SNAPSHOT_DATE=`date -j "+%d-%m-%y"`
         cpack ${{ matrix.config.cpack_flags }}
+      working-directory: ${{ runner.workspace }}/build/avogadroapp
       env:
         P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
         CODESIGN_IDENTITY: ${{ secrets.CODESIGN_ID }}
-      working-directory: ${{ runner.workspace }}/build/avogadroapp
 
     - name: AppImage
-      if: matrix.config.os == 'ubuntu-18.04'
+      if: matrix.config.os == 'ubuntu-20.04' && matrix.config.build_type == 'Release'
       shell: bash
       run: |
         mkdir appdir
@@ -263,27 +289,24 @@ jobs:
         chmod a+x appdir/AppRun
         ./appimagetool-x86_64.AppImage appdir
         mv Avogadro2*.AppImage avogadroapp # for upload
-        # remove the cpack files
-        rm avogadroapp/Avogadro2*Linux.*
       working-directory: ${{ runner.workspace }}/build
 
     - name: Notarize Mac DMG
       if: runner.os == 'macOS'
       run: |
-        # check current directory (failing signing)
-        echo `pwd`
-        ls -ld
         # check if we have the password and the username
         if [ -n "${NOTARIZE_PASSWORD}" ] && [ -n "${NOTARIZE_USERNAME}" ]; then
           codesign -s "$CODESIGN_IDENTITY" --timestamp Avogadro2*.dmg
-          npx notarize-cli --file Avogadro2*.dmg
+          xcrun notarytool submit Avogadro2*.dmg --apple-id "$NOTARIZE_USERNAME" --team-id "$NOTARIZE_TEAM" --password "$NOTARIZE_PASSWORD" --verbose --wait
+          xcrun stapler staple -v Avogadro2*.dmg
         fi
       working-directory: ${{ runner.workspace }}/build/avogadroapp
       env:
+        NOTARIZE_TEAM: ${{ secrets.AC_TEAM }}
         NOTARIZE_USERNAME: ${{ secrets.AC_USERNAME }}
         NOTARIZE_PASSWORD: ${{ secrets.AC_PASSWORD }}
         CODESIGN_IDENTITY: ${{ secrets.CODESIGN_ID }}
-        PRODUCT_BUNDLE_IDENTIFIER: cc.avogadro
+      continue-on-error: true
 
     - name: Setup tmate session
       if: ${{ failure() }}