Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed Sep 13, 2024
1 parent d66bce1 commit dc6fd45
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/actions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion extern/cesium-native

0 comments on commit dc6fd45

Please sign in to comment.