Skip to content

Commit 69ae2e4

Browse files
committed
update workflow for all runners
1 parent 529e684 commit 69ae2e4

File tree

1 file changed

+24
-5
lines changed

1 file changed

+24
-5
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
mesa-common-dev \
5555
unzip
5656
57-
5857
- name: Download OR-Tools
5958
if: steps.cached-ortools-restore.outputs.cache-hit != 'true'
6059
shell: bash
@@ -165,7 +164,7 @@ jobs:
165164
if: steps.cachedssc.outputs.cache-hit != 'true'
166165
run: |
167166
cd $GITHUB_WORKSPACE/ssc
168-
cmake -Bbuild -DCMAKE_CONFIGURATION_TYPES="Release" -DENABLE_COVERAGE=1 -DSAM_SKIP_AUTOGEN=0 -DSAMAPI_EXPORT=1 -DSAM_SKIP_TOOLS=1 -DSAM_SKIP_TESTS=1 -DSAMPRIVATE=1 -DUSE_XPRESS=0 -DUSE_COINOR=1 -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_SYSTEM_PREFIX_PATH=${ORTOOLSDIR} -Dabsl_DIR=${ORTOOLSDIR}\lib\cmake\absl" -Dutf8_range_DIR=${ORTOOLSDIR}\lib\cmake\utf8_range"
167+
cmake -Bbuild -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSAM_SKIP_TESTS=1 -DSAM_SKIP_TOOLS=1 -DSAMAPI_EXPORT=0 -DUSE_XPRESS=0 -DUSE_COINOR=1 -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_SYSTEM_PREFIX_PATH=${ORTOOLSDIR} -Dabsl_DIR=${ORTOOLSDIR}\lib\cmake\absl" -Dutf8_range_DIR=${ORTOOLSDIR}\lib\cmake\utf8_range"
169168
cmake --build build -j4 --target ssc
170169
171170
- name: Checkout SAM
@@ -240,6 +239,16 @@ jobs:
240239
echo "SAMNTDIR=$SAMNTDIR" >> $GITHUB_ENV
241240
WXMSW3=$HOME/wx-$WX_VERSION
242241
echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV
242+
ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools_x64_VisualStudio2022_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE
243+
echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV
244+
245+
- name: Download OR-Tools
246+
if: steps.cached-ortools-restore.outputs.cache-hit != 'true'
247+
shell: bash
248+
run: |
249+
curl -L https://github.com/google/or-tools/releases/download/v$ORTOOLS_VER/or-tools_x64_VisualStudio2022_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE.zip -o or-tools-$ORTOOLS_VER.zip
250+
7z x or-tools-$ORTOOLS_VER.zip
251+
243252
- name: Get cached build of wxWidgets
244253
uses: actions/cache@v4
245254
id: cachedwx
@@ -357,7 +366,7 @@ jobs:
357366
cd ssc
358367
mkdir build
359368
cd build
360-
cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DCMAKE_SYSTEM_VERSION=10 -DSAM_SKIP_TESTS=1 -DSAM_SKIP_TOOLS=1 -DSAMAPI_EXPORT=0 ..
369+
cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DCMAKE_SYSTEM_VERSION=10 -DSAM_SKIP_TESTS=1 -DSAM_SKIP_TOOLS=1 -DSAMAPI_EXPORT=0 -DUSE_XPRESS=0 -DUSE_COINOR=1 -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_SYSTEM_PREFIX_PATH=${ORTOOLSDIR} -Dabsl_DIR=${ORTOOLSDIR}\lib\cmake\absl" -Dutf8_range_DIR=${ORTOOLSDIR}\lib\cmake\utf8_range" ..
361370
MSBuild.exe .\sam_simulation_core.sln /t:Build /p:Configuration=Release
362371
MSBuild.exe .\sam_simulation_core.sln /t:Build /p:Configuration=Debug
363372
@@ -435,7 +444,7 @@ jobs:
435444
runs-on: ${{ matrix.os }}
436445
strategy:
437446
matrix:
438-
os: [macos-14-large, macos-latest]
447+
os: [macos-14-large]
439448

440449
steps:
441450
- name: Setup cmake
@@ -454,6 +463,16 @@ jobs:
454463
echo "RAPIDJSONDIR=$RAPIDJSONDIR" >> $GITHUB_ENV
455464
SAMNTDIR=$GITHUB_WORKSPACE/sam
456465
echo "SAMNTDIR=$SAMNTDIR" >> $GITHUB_ENV
466+
ORTOOLSDIR=$GITHUB_WORKSPACE/or-tools_x86_64_macOS-15.5_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE
467+
echo "ORTOOLSDIR=$ORTOOLSDIR" >> $GITHUB_ENV
468+
469+
470+
- name: Download OR-Tools
471+
if: steps.cached-ortools-restore.outputs.cache-hit != 'true'
472+
shell: bash
473+
run: |
474+
curl -L https://github.com/google/or-tools/releases/download/v$ORTOOLS_VER/or-tools_x86_64_macOS-15.5_cpp_v$ORTOOLS_VER.$ORTOOLS_RELEASE.tar.gz -o or-tools-$ORTOOLS_VER.tar.gz
475+
tar xvzf or-tools-$ORTOOLS_VER.tar.gz
457476
458477
- name: Set relative paths
459478
run: |
@@ -562,7 +581,7 @@ jobs:
562581
if: steps.cachedssc.outputs.cache-hit != 'true'
563582
run: |
564583
cd $GITHUB_WORKSPACE/ssc
565-
cmake -Bbuild -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSAM_SKIP_TESTS=1 -DSAM_SKIP_TOOLS=1 -DSAMAPI_EXPORT=0
584+
cmake -Bbuild -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSAM_SKIP_TESTS=1 -DSAM_SKIP_TOOLS=1 -DSAMAPI_EXPORT=0 -DUSE_XPRESS=0 -DUSE_COINOR=1 -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_SYSTEM_PREFIX_PATH=${ORTOOLSDIR} -Dabsl_DIR=${ORTOOLSDIR}\lib\cmake\absl" -Dutf8_range_DIR=${ORTOOLSDIR}\lib\cmake\utf8_range"
566585
cmake --build build -j4 --target ssc
567586
568587
- name: Checkout SAM

0 commit comments

Comments
 (0)