Merge branch 'master' of github.com:gwaldron/osgearth

gwaldron · Jan 31, 2025 · 7a69a5e · 7a69a5e
2 parents dc19548 + 241f804
commit 7a69a5e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -46,7 +46,7 @@ jobs:
       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOSGEARTH_BUILD_LEGACY_SPLAT_NODEKIT=OFF -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=ON
 
     - name: 'Upload cmake configure log artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
         name: cmake-configure-log
@@ -60,7 +60,7 @@ jobs:
       run: cmake --build . --parallel 4 --config $BUILD_TYPE
 
     - name: 'Upload cmake build log artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
         name: cmake-build-log

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -55,7 +55,7 @@ jobs:
           -GXcode -DVCPKG_MANIFEST_DIR=$GITHUB_WORKSPACE/vcpkg
 
     - name: 'Upload cmake configure log artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
         name: cmake-configure-log
@@ -69,7 +69,7 @@ jobs:
       run: cmake --build . --config $BUILD_TYPE
 
     - name: 'Upload cmake build log artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
         name: cmake-build-log

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -65,7 +65,7 @@ jobs:
         cmake $GITHUB_WORKSPACE -DWIN32_USE_MP=ON -DOSGEARTH_BUILD_LEGACY_SPLAT_NODEKIT=OFF -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=ON -DOSGEARTH_BUILD_CESIUM_NODEKIT=ON -DCESIUM_NATIVE_DIR=C:/cesium-native -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=${{ matrix.VCPKG_WORKSPACE }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=$GITHUB_WORKSPACE/vcpkg
 
     - name: 'Upload cmake configure log artifact'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
         name: cmake-log