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

gwaldron · Sep 18, 2024 · 387d93f · 387d93f
2 parents 904018a + 0583120
commit 387d93f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -32,7 +32,7 @@ jobs:
         sudo apt-get install -y libtinyxml-dev
         sudo apt-get install -y libglew-dev
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -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@v2
+      uses: actions/upload-artifact@v3
       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@v2
+      uses: actions/upload-artifact@v3
       if: ${{ failure() }}
       with:
         name: cmake-build-log

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -31,7 +31,7 @@ jobs:
         brew install glew
         sudo xcode-select -p
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -55,7 +55,7 @@ jobs:
           -GXcode -DVCPKG_MANIFEST_DIR=$GITHUB_WORKSPACE/vcpkg
 
     - name: 'Upload cmake configure log artifact'
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       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@v2
+      uses: actions/upload-artifact@v3
       if: ${{ failure() }}
       with:
         name: cmake-build-log

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -23,7 +23,7 @@ jobs:
             VCPKG_WORKSPACE: 'c:/vcpkg_own'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive