From dc6fd45ef2d1b2676e5447333ac78d61851fba7d Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Thu, 12 Sep 2024 22:45:45 -0400 Subject: [PATCH] Fix --- .github/actions/action.yml | 2 +- .github/workflows/main.yml | 8 ++++---- extern/cesium-native | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/action.yml b/.github/actions/action.yml index f6980823..f5aa0377 100644 --- a/.github/actions/action.yml +++ b/.github/actions/action.yml @@ -11,7 +11,7 @@ runs: env: CONAN_USER_HOME: $GITHUB_WORKSPACE PM_PACKAGES_ROOT: $GITHUB_WORKSPACE/packman-repo - EZVCPKG_BASEDIR: $GITHUB_WORKSPACE + EZVCPKG_BASEDIR: $GITHUB_WORKSPACE/.ezvcpkg VCPKG_TRIPLET: "x64-linux-omniverse" args: # Tell bash to run a command diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 816ae91f..a45e5d46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -102,20 +102,20 @@ jobs: - name: vcpkg Set build directory (Unix) if: runner.os != 'Windows' run: | - echo "EZVCPKG_BASEDIR=$GITHUB_WORKSPACE" >> $GITHUB_ENV + echo "EZVCPKG_BASEDIR=$GITHUB_WORKSPACE/.ezvcpkg" >> $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 "EZVCPKG_BASEDIR=$env:GITHUB_WORKSPACE/.ezvcpkg" >> $env:GITHUB_ENV echo "CESIUM_VCPKG_RELEASE_ONLY=TRUE" >> $env:GITHUB_ENV - name: vcpkg Check cache id: vcpkg-cache uses: actions/cache@v3 with: - path: ${{ env.EZVCPKG_BASEDIR }}/.ezvcpkg + path: ${{ env.EZVCPKG_BASEDIR }} key: vcpkg-${{ matrix.config.name }}-${{ hashFiles('vcpkg/ports/**/*', 'vcpkg/triplets/**/*') }}-${{ hashFiles('extern/cesium-native/CMakeLists.txt', 'CMakeLists.txt') }} - name: Packman Check cache @@ -139,7 +139,7 @@ jobs: 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 + sudo chown -R $USER:$USER $EZVCPKG_BASEDIR - name: Install Linux dependencies if: ${{ runner.os == 'Linux' && matrix.config.name != 'AlmaLinux 8 - GCC' }} diff --git a/extern/cesium-native b/extern/cesium-native index 730faffb..d9550023 160000 --- a/extern/cesium-native +++ b/extern/cesium-native @@ -1 +1 @@ -Subproject commit 730faffb095f3ddb091290d7ad1b59aaea92cfbe +Subproject commit d9550023802f1d529b0162733cf8757f9ade017b