From 87da978b7211f603b77826d71f3067175e6ee0a2 Mon Sep 17 00:00:00 2001 From: Joachim Faulhaber Date: Thu, 7 Sep 2023 18:32:49 +0200 Subject: [PATCH] Removed cppxx 03 in ci and drone configs to get rid of dependent compile errors in tests --- .drone.star | 2 +- .github/workflows/ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 54e26fa..b3bac16 100644 --- a/.drone.star +++ b/.drone.star @@ -14,7 +14,7 @@ windowsglobalimage="cppalliance/dronevs2019" def main(ctx): return [ - linux_cxx("TOOLSET=gcc CXXSTD=03,11 Job 0", "g++", packages="", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc', 'CXXSTD': '03,11', 'DRONE_JOB_UUID': 'b6589fc6ab'}, globalenv=globalenv), + linux_cxx("TOOLSET=gcc CXXSTD=11 Job 0", "g++", packages="", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc', 'CXXSTD': '11', 'DRONE_JOB_UUID': 'b6589fc6ab'}, globalenv=globalenv), linux_cxx("TOOLSET=gcc-5 CXXSTD=03,11,14,1z Job 1", "g++-5", packages="g++-5", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-5', 'CXXSTD': '03,11,14,1z', 'DRONE_JOB_UUID': '356a192b79'}, globalenv=globalenv), linux_cxx("TOOLSET=gcc-6 CXXSTD=03,11,14,1z Job 2", "g++-6", packages="g++-6", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-6', 'CXXSTD': '03,11,14,1z', 'DRONE_JOB_UUID': 'da4b9237ba'}, globalenv=globalenv), linux_cxx("TOOLSET=gcc-7 CXXSTD=03,11,14,17 Job 3", "g++-7", packages="g++-7", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-7', 'CXXSTD': '03,11,14,17', 'DRONE_JOB_UUID': '77de68daec'}, globalenv=globalenv), diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0703f05..dab4523 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: include: - - name: "TOOLSET=gcc CXXSTD=03,11 Job 0" + - name: "TOOLSET=gcc CXXSTD=11 Job 0" buildtype: "boost" packages: "" packages_to_remove: "" @@ -28,7 +28,7 @@ jobs: llvm_os: "" llvm_ver: "" toolset: "gcc" - cxxstd: "03,11" + cxxstd: "11" - name: "TOOLSET=gcc-5 CXXSTD=03,11,14,1z Job 1" buildtype: "boost" packages: "g++-5"