Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
mfep committed May 29, 2024
1 parent 029e509 commit 0ed663c
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions .github/workflows/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
--binary clang-format

linux:
if: false
runs-on: ubuntu-latest
needs: format
defaults:
Expand Down Expand Up @@ -300,6 +301,7 @@ jobs:
fi;

windows:
if: false
runs-on: windows-latest
needs: format
defaults:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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: |
Expand All @@ -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)
Expand All @@ -780,14 +787,16 @@ 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)
if: matrix.DEPS == 'vcpkg' && steps.vcpkg-install.outputs.cache-hit != 'true'
# 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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down

0 comments on commit 0ed663c

Please sign in to comment.