Update linux_server_build.yml, master_build.yml, pr_build.yml, and 1 …

…more file
overte-org · Jan 24, 2025 · f5ec6e6 · f5ec6e6
1 parent 2bb6e17
commit f5ec6e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml
@@ -136,6 +136,7 @@ jobs:
 
         echo "JOB_NAME=${{matrix.os}}, ${{matrix.arch}}" >> $GITHUB_ENV
         echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
+        echo "CONAN_CPPSTD=gnu17" >> $GITHUB_ENV
 
         echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
 
@@ -246,7 +247,7 @@ jobs:
 
     - name: Install Conan dependencies
       shell: bash
-      run: conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT^} -b missing -pr:b=default -of build
+      run: conan install . -s compiler.cppstd=$CONAN_CPPSTD -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT^} -b missing -pr:b=default -of build
 
     - name: Configure CMake
       working-directory: build

diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
@@ -73,6 +73,7 @@ jobs:
         echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
         # Linux build variables
         if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
+          echo "CONAN_CPPSTD=gnu17" >> $GITHUB_ENV
           echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
           echo "INSTALLER_EXT=tgz" >> $GITHUB_ENV
           echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
@@ -90,6 +91,7 @@ jobs:
         fi
         # Windows build variables
         if [ "${{ matrix.os }}" = "windows-2019" ]; then
+          echo "CONAN_CPPSTD=17" >> $GITHUB_ENV
           echo "PYTHON_EXEC=python" >> $GITHUB_ENV
           echo "ZIP_COMMAND=7z" >> $GITHUB_ENV
           echo "ZIP_ARGS=a" >> $GITHUB_ENV
@@ -182,7 +184,7 @@ jobs:
 
     - name: Install Conan dependencies
       shell: bash
-      run: conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT^} -b missing -pr:b=default -of build
+      run: conan install . -s compiler.cppstd=$CONAN_CPPSTD -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT^} -b missing -pr:b=default -of build
 
     - name: Configure CMake
       working-directory: build

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
@@ -92,8 +92,8 @@ jobs:
         echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
 
         # Linux build variables
-        echo "CONAN_CPPSTD=gnu17" >> $GITHUB_ENV
         if [[ "${{ matrix.os }}" = "Ubuntu"* ]]; then
+          echo "CONAN_CPPSTD=gnu17" >> $GITHUB_ENV
           echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
           echo "INSTALLER_EXT=*" >> $GITHUB_ENV
           echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
@@ -134,8 +134,9 @@ jobs:
           echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
         fi
         # Windows build variables
-        echo "CONAN_CPPSTD=17" >> $GITHUB_ENV
+
         if [ "${{ matrix.os }}" = "Windows 2019" ]; then
+          echo "CONAN_CPPSTD=17" >> $GITHUB_ENV
           echo "PYTHON_EXEC=python" >> $GITHUB_ENV
           echo "INSTALLER_EXT=exe" >> $GITHUB_ENV
           if [ "${{ matrix.build_type }}" = "full" ]; then

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -58,6 +58,7 @@ jobs:
         echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
         echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
         echo "CONAN_QT=${{matrix.conan_qt}}" >> $GITHUB_ENV
+        echo "CONAN_CPPSTD=17" >> $GITHUB_ENV
 
         echo "PYTHON_EXEC=python" >> $GITHUB_ENV
         echo "ZIP_COMMAND=7z" >> $GITHUB_ENV
@@ -102,7 +103,7 @@ jobs:
 
     - name: Install Conan dependencies
       shell: bash
-      run: conan install . -s compiler.cppstd=17 -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT^} -b missing -pr:b=default -of build
+      run: conan install . -s compiler.cppstd=$CONAN_CPPSTD -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT^} -b missing -pr:b=default -of build
 
     - name: Configure CMake
       working-directory: build