Skip to content

Commit

Permalink
Fix C/I, take I
Browse files Browse the repository at this point in the history
  • Loading branch information
kordejong committed Aug 29, 2023
1 parent e006d3f commit b6e9c64
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: macOS CI
on:
push:
branches-ignore:
- "ghxyz"
- "gh547"
paths:
- ".github/workflows/macos.yml"
- "environment/cmake/**"
Expand All @@ -29,7 +29,6 @@ jobs:

- name: configure system
run: |
# brew update # > /dev/null || true
brew install \
asio \
boost \
Expand Down
18 changes: 16 additions & 2 deletions environment/conda/bld.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
mkdir build
if errorlevel 1 exit 1

REM TODO Figure out compiler version. Should be 19x.
REM https://blog.knatten.org/2022/08/26/microsoft-c-versions-explained/

REM Select the first line, remove everything before and after the version number, remove all dots,
REM grab the first three bytes
REM Example input: Microsoft (R) C/C++ Optimizing Compiler Version 19.35.32217.1 for x64
REM Results in: 193
REM See Conan's settings.yml for supported values
REM TODO How to do all this from a Windows batch file?
REM compiler_version=$($CXX 2>&1 | head -n 1 | sed 's/^.*Version // ; s/ .*// ; s/[.]//g' | head -c 3)

%CXX%

set compiler_version=193

conan profile detect

Expand All @@ -12,7 +26,7 @@ build_type=Release ^

compiler=msvc ^

compiler.version=%VS_MAJOR% ^
compiler.version=%compiler_version% ^

compiler.cppstd=17 ^

Expand All @@ -26,7 +40,7 @@ build_type=Release ^

compiler=msvc ^

compiler.version=%VS_MAJOR% ^
compiler.version=%compiler_version% ^

compiler.cppstd=17 ^

Expand Down

0 comments on commit b6e9c64

Please sign in to comment.