Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating promote and boost #98

Merged
merged 60 commits into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
004f703
Updating promote and boost
sean-parent May 30, 2023
6b30439
Updated code for C++17
sean-parent Jun 2, 2023
a389ce3
Adding missing CI script and removing deprecated CI construct
sean-parent Jun 2, 2023
6c3e2c5
Trying legacy path for workflow.
sean-parent Jun 2, 2023
a32ffa9
Updating execution bit for flatten_json.py
sean-parent Jun 2, 2023
0a337da
Update adobe_source_libraries.yml
sean-parent Jun 2, 2023
0bb5bf3
Adding boost installs
sean-parent Jun 2, 2023
99cab24
MacOS failed to find compiler - removing brew update and using latest…
sean-parent Jun 2, 2023
203dd77
Update adobe_source_libraries.yml
sean-parent Jun 2, 2023
055e583
Update adobe_source_libraries.yml
sean-parent Jun 2, 2023
0e77d24
Trying to get windows build going and cleaning up cstdint while waiting.
sean-parent Jun 2, 2023
21e2560
Another attempt on Windows...
sean-parent Jun 3, 2023
95b01b3
Update CMakeLists.txt
sean-parent Jun 3, 2023
cefe5b2
Update adobe_source_libraries.yml
sean-parent Jun 3, 2023
fcaf925
Testing to see if this is still needed on windows.
sean-parent Jun 3, 2023
fa2bb8b
adding dependencies
sean-parent Jun 3, 2023
c564530
Update adobe_source_libraries.yml
sean-parent Jun 3, 2023
4635503
Update CMakeLists.txt
sean-parent Jun 3, 2023
a75e8ca
Update CMakeLists.txt
sean-parent Jun 3, 2023
b0eff61
Update adobe_source_libraries.yml
sean-parent Jun 3, 2023
a35e035
99 tries to get Windows to build...
sean-parent Jun 3, 2023
dd58d68
Attemmpt to fix CI by disabling unix-flavored compiler options.
nickpdemarco Jun 6, 2023
aec1360
Cmake typo
nickpdemarco Jun 6, 2023
2fe62c1
More improvements.
sean-parent Jun 6, 2023
178795e
Merge branch 'sean-parent/conversion' of https://github.com/stlab/ado…
sean-parent Jun 6, 2023
049d51c
Removing warnings and fixing for windows.
sean-parent Jun 6, 2023
619097d
More cleanup for windows
sean-parent Jun 6, 2023
e64d06e
Removing hack for testing - breaks windows build.
sean-parent Jun 7, 2023
61a88da
Update main.cpp
sean-parent Jun 7, 2023
5d2cfe6
Update main.cpp
sean-parent Jun 7, 2023
b8eea14
And more windows fixes...
sean-parent Jun 7, 2023
8c8c2e5
disambiguating calls to begin/end.
sean-parent Jun 7, 2023
2071c1f
Adding NOMINMAX to Windows builds
sean-parent Jun 7, 2023
e4ccbe1
Update pmeval.cpp
sean-parent Jun 7, 2023
6c626a1
Updating windows compiler to fix long strings in test cases.
sean-parent Jun 7, 2023
0830227
Missing header.
sean-parent Jun 7, 2023
fec688c
Windows build working locally
sean-parent Jun 10, 2023
a5cab5c
Patching to fix windows build in CI
sean-parent Jun 10, 2023
9e507e9
Update adobe_source_libraries.yml
sean-parent Jun 10, 2023
7c164f7
Update adobe_source_libraries.yml
sean-parent Jun 10, 2023
90874d2
Reverting to shorter dependency list, add flag to specify dyn linking…
sean-parent Jun 10, 2023
4c7a3b6
Attempt to convert setup to bash.
sean-parent Jun 11, 2023
ae8b529
Trying again with path forms converted.
sean-parent Jun 11, 2023
07d741c
Trying without source
sean-parent Jun 11, 2023
f659da0
Update adobe_source_libraries.yml
sean-parent Jun 11, 2023
dbf86b4
Update CMakeLists.txt
sean-parent Jun 12, 2023
27338f8
Experiment to fix Windows build
dabrahams Jun 12, 2023
1def5b3
Trying vcpkg versioning
sean-parent Jun 19, 2023
e1ae991
Update vcpkg.json
sean-parent Jun 19, 2023
31fe753
Update vcpkg.json
sean-parent Jun 19, 2023
41aa725
Trying rolling version way back.
sean-parent Jun 19, 2023
b3b5689
Add missing vcvarsall.bat call to Windows CI workflow
camio Jun 20, 2023
c192a9a
Temporarily disable sha_shevs test
camio Jun 20, 2023
7dbb55f
Remove cruft
camio Jun 20, 2023
8f21245
Set proper configuration for VS2022
camio Jun 20, 2023
1ee13ba
Adding vscode preset for macOS
sean-parent Jun 20, 2023
979dda2
Merge remote-tracking branch 'origin/windows-CI-fix' into sean-parent…
sean-parent Jun 20, 2023
ded9643
Cleanup
sean-parent Jun 20, 2023
e03dde0
Merge branches 'sean-parent/conversion' and 'sean-parent/conversion' …
sean-parent Jun 20, 2023
4af46e1
Final Cleanup?
sean-parent Jun 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
13 changes: 6 additions & 7 deletions .github/matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
"os": "ubuntu-22.04"
},
{
"name": "macOS apple-clang 13.0.1",
"name": "macOS apple-clang 14.3.1",
"compiler": "apple-clang",
"version": "13.0.1",
"os": "macos-11"
"version": "14.3.1",
"os": "macos-13"
},
{
"name": "Windows VS2019",
"name": "Windows VS2022",
"compiler": "Visual Studio",
"version": "16",
"os": "windows-2019",
"cmake_toolset": "Visual Studio 16 2019"
"version": "17.4",
"os": "windows-2022"
}
]
}
26 changes: 15 additions & 11 deletions .github/workflows/adobe_source_libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- main
- master

jobs:
generate-matrix:
Expand All @@ -18,8 +18,9 @@ jobs:
- name: Generate job matrix
id: set-matrix
# Note: The json in this variable must be a single line for parsing to succeed.
# run: echo "matrix=$(cat .github/matrix.json | scripts/flatten_json.py)" >> $GITHUB_STATE
run: echo "::set-output name=matrix::$(cat .github/matrix.json | scripts/flatten_json.py)"

builds:
needs: generate-matrix
runs-on: ${{ matrix.config.os }}
Expand All @@ -34,19 +35,22 @@ jobs:
- name: Install dependencies (macos)
if: ${{ startsWith(matrix.config.os, 'macos') }}
run: |
brew install boost
brew install ninja
shell: bash

- name: Install dependencies (ubuntu)
if: ${{ startsWith(matrix.config.os, 'ubuntu') }}
run: |
sudo apt-get install -y ninja-build
sudo apt-get install -y libboost-all-dev
shell: bash

- name: Install dependencies (Windows)
if: ${{ startsWith(matrix.config.os, 'windows') }}
run: |
choco install --yes ninja
vcpkg install --triplet=x64-windows
shell: cmd

- name: Set enviroment variables (Linux+GCC)
Expand All @@ -63,12 +67,12 @@ jobs:
echo "CC=clang-${{matrix.config.version}}" >> $GITHUB_ENV
echo "CXX=clang++-${{matrix.config.version}}" >> $GITHUB_ENV

- name: Set enviroment variables (MacOS)
if: ${{ matrix.config.compiler == 'apple-clang' }}
shell: bash
run: |
echo "CC=$(brew --prefix llvm@13)/bin/clang" >> $GITHUB_ENV
echo "CXX=$(brew --prefix llvm@13)/bin/clang++" >> $GITHUB_ENV
# - name: Set enviroment variables (MacOS)
# if: ${{ matrix.config.compiler == 'apple-clang' }}
# shell: bash
# run: |
# echo "CC=$(brew --prefix llvm@13)/bin/clang" >> $GITHUB_ENV
# echo "CXX=$(brew --prefix llvm@13)/bin/clang++" >> $GITHUB_ENV

- name: Configure (Ubuntu)
if: ${{ startsWith(matrix.config.os, 'ubuntu') }}
Expand All @@ -88,9 +92,9 @@ jobs:
if: ${{ startsWith(matrix.config.os, 'windows') }}
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
mkdir ..\build
cmake -S. -B../build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23
cmake -S. -B../build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DBOOST_TEST_DYN_LINK=TRUE

- name: Build (Unix)
if: ${{ startsWith(matrix.config.os, 'ubuntu') || startsWith(matrix.config.os, 'macos') }}
Expand All @@ -102,7 +106,7 @@ jobs:
if: ${{ startsWith(matrix.config.os, 'windows') }}
shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
cmake --build ../build/

- name: Test
Expand Down
20 changes: 20 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"configurations": [
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [],
"macFrameworkPath": [
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "macos-clang-arm64",
"compileCommands": "${workspaceFolder}/build/compile_commands.json"
}
],
"version": 4
}
133 changes: 133 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"files.associations": {
"__bit_reference": "cpp",
"__bits": "cpp",
"__config": "cpp",
"__debug": "cpp",
"__errc": "cpp",
"__hash_table": "cpp",
"__locale": "cpp",
"__mutex_base": "cpp",
"__node_handle": "cpp",
"__split_buffer": "cpp",
"__threading_support": "cpp",
"__tree": "cpp",
"__tuple": "cpp",
"__verbose_abort": "cpp",
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"exception": "cpp",
"fstream": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"ratio": "cpp",
"set": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"string": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"variant": "cpp",
"vector": "cpp",
"__nullptr": "cpp",
"__string": "cpp",
"chrono": "cpp",
"compare": "cpp",
"concepts": "cpp",
"numeric": "cpp",
"random": "cpp",
"algorithm": "cpp",
"filesystem": "cpp",
"cfenv": "cpp",
"csignal": "cpp",
"strstream": "cpp",
"typeindex": "cpp",
"hash_map": "cpp",
"any": "cpp",
"barrier": "cpp",
"charconv": "cpp",
"cinttypes": "cpp",
"codecvt": "cpp",
"coroutine": "cpp",
"csetjmp": "cpp",
"execution": "cpp",
"format": "cpp",
"forward_list": "cpp",
"functional": "cpp",
"iterator": "cpp",
"latch": "cpp",
"memory_resource": "cpp",
"numbers": "cpp",
"ranges": "cpp",
"regex": "cpp",
"scoped_allocator": "cpp",
"semaphore": "cpp",
"shared_mutex": "cpp",
"source_location": "cpp",
"span": "cpp",
"stop_token": "cpp",
"syncstream": "cpp",
"unordered_set": "cpp",
"utility": "cpp",
"valarray": "cpp",
"xfacet": "cpp",
"xhash": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xmemory": "cpp",
"xstddef": "cpp",
"xstring": "cpp",
"xtr1common": "cpp",
"xtree": "cpp",
"xutility": "cpp",
"*.ipp": "cpp",
"*.tcc": "cpp",
"rope": "cpp",
"slist": "cpp"
}
}
Loading