Merge branch 'master' into develop

abdes · May 7, 2024 · 0b38486 · 0b38486
2 parents ca80d55 + cbd90ae
commit 0b38486
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
@@ -58,7 +58,7 @@ jobs:
             }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -116,7 +116,7 @@ jobs:
         if: runner.os == 'Linux'
         shell: bash
         run: |
-          sudo apt-get install -y -qq xorg-dev libglu1-mesa-dev
+          sudo apt-get install -y -qq xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
 
       - name: Install gcc-11
         shell: bash

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -9,7 +9,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -47,7 +47,7 @@ jobs:
       - name: Install X11 dependencies
         shell: bash
         run: |
-          sudo apt-get install -y -qq xorg-dev libglu1-mesa-dev
+          sudo apt-get install -y -qq xorg-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
 
       - name: Configure CMake
         run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

diff --git a/.github/workflows/macos-builds.yml b/.github/workflows/macos-builds.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        generator: ['Unix Makefiles', Xcode]
+        generator: ['Unix Makefiles']
         build_type: [Debug, Release]
         include:
           - build_type: Debug
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1
+        uses: jwlawson/actions-setup-cmake@v2
         with:
           cmake-version: ${{ env.CMAKE_VERSION }}
 
@@ -39,9 +39,9 @@ jobs:
 
       - name: Setup XCode
         if: matrix.generator == 'Xcode'
-        uses: mobiledevops/xcode-select-version-action@v1
+        uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-select-version: 13.1
+          xcode-version: latest-stable
 
       - name: Log environment properties
         run: |
@@ -51,14 +51,14 @@ jobs:
           clang --version
           ccache --version
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Configure build
         working-directory: ${{runner.workspace}}
         run: |
-          cmake -B build -S $GITHUB_WORKSPACE \
+          cmake -B build -S asap_app_imgui \
             -D CMAKE_BUILD_TYPE=${{matrix.build_type}} \
             -G "${{ matrix.generator }}" \
             -D USE_CCACHE=ON \

diff --git a/.github/workflows/ubuntu-builds.yml b/.github/workflows/ubuntu-builds.yml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Install X11 dependencies
         run: |
-          sudo apt-get install -y -qq xorg-dev libglu1-mesa-dev
+          sudo apt-get install -y -qq xorg-dev libglu1-mesa-dev libglu1-mesa-dev libwayland-dev libxkbcommon-dev
 
       - name: Install GCC (always runs)
         run: |
@@ -92,7 +92,7 @@ jobs:
             clang-tools-${{steps.split.outputs.clang_version}} \
             clang-tidy-${{steps.split.outputs.clang_version}}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -129,7 +129,7 @@ jobs:
       - name: Setup cmake
         # Do not use cmake from the distro repos as it is not the version we
         # want
-        uses: jwlawson/actions-setup-cmake@v1
+        uses: jwlawson/actions-setup-cmake@v2
         with:
           cmake-version: ${{ env.CMAKE_VERSION }}
 
@@ -169,7 +169,7 @@ jobs:
       - name: Configure build
         working-directory: ${{runner.workspace}}
         run: |
-          cmake -B build -S $GITHUB_WORKSPACE \
+          cmake -B build -S asap_app_imgui \
             -D CMAKE_BUILD_TYPE=${{matrix.build_type}} \
             -G Ninja \
             -D CMAKE_MAKE_PROGRAM=ninja \

diff --git a/.github/workflows/windows-builds.yml b/.github/workflows/windows-builds.yml
@@ -30,7 +30,7 @@ jobs:
           version: ${{ env.NINJA_VERSION }}
 
       - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v1
+        uses: jwlawson/actions-setup-cmake@v2
         with:
           cmake-version: ${{ env.CMAKE_VERSION }}
 
@@ -62,7 +62,7 @@ jobs:
       - name: Configure build
         working-directory: ${{runner.workspace}}
         run: |
-          cmake -B build -S asap `
+          cmake -B build -S asap_app_imgui `
             -D CMAKE_BUILD_TYPE=${{matrix.build_type}} `
             -G "${{ matrix.generator }}" `
             -D USE_CCACHE=ON `

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -28,7 +28,7 @@ message(STATUS "${ASAP_LOG_PROJECT_HIERARCHY} >> third-party modules")
 # GSL
 # ------------------------------------------------------------------------------
 
-asap_add_package(NAME gsl GIT_TAG main GITHUB_REPOSITORY microsoft/GSL)
+asap_add_package(NAME gsl GIT_TAG v4.0.0 GITHUB_REPOSITORY microsoft/GSL)
 
 # ------------------------------------------------------------------------------
 # fmt::fmt-header-only