Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed Sep 12, 2024
1 parent 94dcd65 commit 92293be
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/actions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ runs:
env:
CONAN_USER_HOME: $GITHUB_WORKSPACE
PM_PACKAGES_ROOT: $GITHUB_WORKSPACE/packman-repo
EZVCPKG_BASEDIR: $GITHUB_WORKSPACE
args:
# Tell bash to run a command
- "-c"
Expand Down
25 changes: 24 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,28 @@ jobs:
path: ${{ env.CONAN_USER_HOME }}/.conan
key: conan-${{ matrix.config.name }}-${{ hashFiles('cmake/AddConanDependencies.cmake') }}-v3

# Tell ezvcpkg to look for or create its build folder (.ezvcpkg) in the repository's root directory
# This is partly done to make the directory easily accessible to Docker builds
# We only need a release build of vcpkg dependencies
- name: vcpkg Set build directory (Unix)
if: runner.os != 'Windows'
run: |
echo "EZVCPKG_BASEDIR=$GITHUB_WORKSPACE" >> $GITHUB_ENV
echo "CESIUM_VCPKG_RELEASE_ONLY=TRUE" >> $GITHUB_ENV
- name: vcpkg Set build directory (Windows)
if: runner.os == 'Windows'
run: |
echo "EZVCPKG_BASEDIR=$env:GITHUB_WORKSPACE" >> $env:GITHUB_ENV
echo "CESIUM_VCPKG_RELEASE_ONLY=TRUE" >> $GITHUB_ENV
- name: vcpkg Check cache
id: vcpkg-cache
uses: actions/cache@v3
with:
path: ${{ env.EZVCPKG_BASEDIR }}/.ezvcpkg
key: vcpkg-${{ matrix.config.name }}-${{ hashFiles('vcpkg/ports/**/*', 'vcpkg/triplets/**/*') }}-${{ hashFiles('extern/cesium-native/CMakeLists.txt', 'CMakeLists.txt') }}

- name: Packman Check cache
id: packman-cache
uses: actions/cache@v3
Expand All @@ -112,11 +134,12 @@ jobs:
# Change the ownership from root to user for all files created by Docker in
# the Conan build directory so that the files can be cached without permission
# denied errors
- name: AlmaLinux Change Conan & Packman directory permissions
- name: AlmaLinux Change Conan, vcpkg, and Packman directory permissions
if: matrix.config.name == 'AlmaLinux 8 - GCC'
run: |
sudo chown -R $USER:$USER $CONAN_USER_HOME/.conan
sudo chown -R $USER:$USER $PM_PACKAGES_ROOT
sudo chown -R $USER:$USER $EZVCPKG_BASEDIR/.ezvcpkg
- name: Install Linux dependencies
if: ${{ runner.os == 'Linux' && matrix.config.name != 'AlmaLinux 8 - GCC' }}
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ compile_commands.json
trace.json
trace.csv

# CI puts Conan in the project directory
.conan

# Clion Config
.idea

Expand Down
2 changes: 1 addition & 1 deletion vcpkg/triplets/x64-windows-omniverse.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE static)

# Techically we should be setting /MDd if USE_NVIDIA_RELEASE_LIBRARIES is false
set(VCPKG_CXX_FLAGS "/MD /MP /EHsc -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
set(VCPKG_CXX_FLAGS "/MD /EHsc -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS}")

0 comments on commit 92293be

Please sign in to comment.