diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index f7e5d5f..fb898fb 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -22,6 +22,7 @@ jobs: --binary clang-format linux: + if: false runs-on: ubuntu-latest needs: format defaults: @@ -300,6 +301,7 @@ jobs: fi; windows: + if: false runs-on: windows-latest needs: format defaults: @@ -375,7 +377,10 @@ jobs: - name: Install dependencies (vcpkg) if: matrix.DEPS == 'vcpkg' && steps.vcpkg-install.outputs.cache-hit != 'true' - run: C:\vcpkg\vcpkg.exe install boost-wave:${{matrix.BIN}}-windows-static-md + run: | + cd ${env:VCPKG_INSTALLATION_ROOT} + git pull + .\vcpkg.exe install boost-wave:${{matrix.BIN}}-windows-static-md - name: Cache Ninja install id: ninja-install @@ -730,14 +735,14 @@ jobs: COMPILER: - CC: /usr/bin/clang CXX: /usr/bin/clang++ - - CC: gcc-11 - CXX: g++-11 - - CC: gcc-13 - CXX: g++-13 + # - CC: gcc-11 + # CXX: g++-11 + # - CC: gcc-13 + # CXX: g++-13 GEN: - Xcode - - Ninja Multi-Config - DEPS: [system, vcpkg, fetch] + # - Ninja Multi-Config + DEPS: [vcpkg] # [system, vcpkg, fetch] exclude: # These entries are excluded, since XCode selects its own compiler - COMPILER: @@ -761,6 +766,7 @@ jobs: env: CC: ${{matrix.COMPILER.CC}} CXX: ${{matrix.COMPILER.CXX}} + VCPKG_INSTALLATION_ROOT: ${{github.workspace}}/../vcpkg steps: - name: Create Build Environment run: | @@ -769,6 +775,7 @@ jobs: if [[ "${{matrix.DEPS}}" == "vcpkg" && ! `which pkg-config` ]]; then brew install pkg-config; fi; # We need to provide an OpenCL driver for Intel CPU on mac brew install pocl + ls -lah /opt/homebrew/Cellar/pocl/5.0/etc/OpenCL/vendors cmake --version - name: Install dependencies (Homebrew) @@ -780,7 +787,7 @@ jobs: id: vcpkg-install uses: actions/cache@v4 with: - path: /usr/local/share/vcpkg + path: ${{env.VCPKG_INSTALLATION_ROOT}} key: vcpkg-macos-${{matrix.COMPILER.CXX}} - name: Install dependencies (vcpkg) @@ -788,6 +795,8 @@ jobs: # Important: the same compiler must be used with vcpkg as with the project build # because apple-clang uses a different standard library implementation from GCC run: | + git clone https://github.com/Microsoft/vcpkg.git $VCPKG_INSTALLATION_ROOT + $VCPKG_INSTALLATION_ROOT/bootstrap-vcpkg.sh $VCPKG_INSTALLATION_ROOT/vcpkg install boost-wave gtest rapidxml - name: Set up compiler flags @@ -891,7 +900,7 @@ jobs: then export LABEL_EXCLUDE=system-icd; fi - export OCL_ICD_VENDORS=/usr/local/etc/OpenCL/vendors + export OCL_ICD_VENDORS=/opt/homebrew/Cellar/pocl/5.0/etc/OpenCL/vendors ctest --test-dir $GITHUB_WORKSPACE/build --output-on-failure --no-tests=error -C Debug --parallel `sysctl -n hw.logicalcpu` --label-exclude $LABEL_EXCLUDE ctest --test-dir $GITHUB_WORKSPACE/build --output-on-failure --no-tests=error -C Release --parallel `sysctl -n hw.logicalcpu` --label-exclude $LABEL_EXCLUDE @@ -915,11 +924,12 @@ jobs: # For an unknown reason, there are test failures when compiled with g++ in the GitHub shared runner, and pocl is used. if: matrix.COMPILER.CC == '/usr/bin/clang' run: | - export OCL_ICD_VENDORS=/usr/local/etc/OpenCL/vendors + export OCL_ICD_VENDORS=/opt/homebrew/Cellar/pocl/5.0/etc/OpenCL/vendors ctest --output-on-failure --no-tests=error --test-dir $GITHUB_WORKSPACE/program-cache/lib/test/package/build -C Debug --parallel `sysctl -n hw.logicalcpu` ctest --output-on-failure --no-tests=error --test-dir $GITHUB_WORKSPACE/program-cache/lib/test/package/build -C Release --parallel `sysctl -n hw.logicalcpu` android: + if: false runs-on: ubuntu-latest needs: format defaults: