build: align minimum build dependencies with ndn-cxx
* gcc 7.4
* clang 6.0
* Xcode 10.0 (11.3 or later recommended)
Change-Id: I4263fb6fb0766f0522710d83ad9eb3aba10718fb
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9f98d8..47d9a6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,8 +22,6 @@
include:
- compiler: g++-7
os: ubuntu-18.04
- - compiler: clang++-5.0
- os: ubuntu-18.04
- compiler: clang++-6.0
os: ubuntu-18.04
runs-on: ${{ matrix.os }}
@@ -37,7 +35,7 @@
sudo apt-get -qy install ${CXX/clang++/clang}
${CXX} --version
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Build and test
run: ./.jenkins
@@ -63,6 +61,6 @@
with:
xcode-version: ${{ matrix.xcode }}
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Build and test
run: ./.jenkins
diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index f3be6e7..f086c17 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -16,20 +16,21 @@
errmsg = ''
warnmsg = ''
if cxx == 'gcc':
- if ccver < (5, 3, 0):
+ if ccver < (7, 4, 0):
errmsg = ('The version of gcc you are using is too old.\n'
- 'The minimum supported gcc version is 7.4.0.')
- elif ccver < (7, 4, 0):
- warnmsg = ('Using a version of gcc older than 7.4.0 is not '
- 'officially supported and may result in build failures.')
+ 'The minimum supported gcc version is 7.4.')
conf.flags = GccFlags()
elif cxx == 'clang':
- if Utils.unversioned_sys_platform() == 'darwin' and ccver < (9, 0, 0):
- errmsg = ('The version of Xcode you are using is too old.\n'
- 'The minimum supported Xcode version is 9.0.')
- elif ccver < (4, 0, 0):
+ if Utils.unversioned_sys_platform() == 'darwin':
+ if ccver < (10, 0, 0):
+ errmsg = ('The version of Xcode you are using is too old.\n'
+ 'The minimum supported Xcode version is 11.3.')
+ elif ccver < (11, 0, 0):
+ warnmsg = ('Using a version of Xcode older than 11.3 is not '
+ 'officially supported and may result in build failures.')
+ elif ccver < (6, 0, 0):
errmsg = ('The version of clang you are using is too old.\n'
- 'The minimum supported clang version is 4.0.')
+ 'The minimum supported clang version is 6.0.')
conf.flags = ClangFlags()
else:
warnmsg = '%s compiler is unsupported' % cxx
@@ -181,7 +182,7 @@
flags['CXXFLAGS'] += ['-fdiagnostics-color',
'-Wredundant-tags',
]
- if platform.machine() == 'armv7l' and self.getCompilerVersion(conf) >= (7, 1, 0):
+ if platform.machine() == 'armv7l':
flags['CXXFLAGS'] += ['-Wno-psabi'] # Bug #5106
return flags
@@ -190,7 +191,7 @@
flags['CXXFLAGS'] += ['-fdiagnostics-color',
'-Wredundant-tags',
]
- if platform.machine() == 'armv7l' and self.getCompilerVersion(conf) >= (7, 1, 0):
+ if platform.machine() == 'armv7l':
flags['CXXFLAGS'] += ['-Wno-psabi'] # Bug #5106
return flags
@@ -212,8 +213,6 @@
'-Wundefined-func-template',
'-Wno-unused-local-typedef', # Bugs #2657 and #3209
]
- if self.getCompilerVersion(conf) < (6, 0, 0):
- flags['CXXFLAGS'] += ['-Wno-missing-braces'] # Bug #4721
return flags
def getOptimizedFlags(self, conf):
@@ -222,6 +221,4 @@
'-Wundefined-func-template',
'-Wno-unused-local-typedef', # Bugs #2657 and #3209
]
- if self.getCompilerVersion(conf) < (6, 0, 0):
- flags['CXXFLAGS'] += ['-Wno-missing-braces'] # Bug #4721
return flags
diff --git a/tests/global-configuration.cpp b/tests/global-configuration.cpp
index 0c92646..e526936 100644
--- a/tests/global-configuration.cpp
+++ b/tests/global-configuration.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2017-2021, Regents of the University of California.
+ * Copyright (c) 2017-2022, Regents of the University of California.
*
* This file is part of ndncert, a certificate management system based on NDN.
*
@@ -61,13 +61,7 @@
std::string m_home;
};
-#if BOOST_VERSION >= 106500
BOOST_TEST_GLOBAL_CONFIGURATION(GlobalConfiguration);
-#elif BOOST_VERSION >= 105900
-BOOST_GLOBAL_FIXTURE(GlobalConfiguration);
-#else
-BOOST_GLOBAL_FIXTURE(GlobalConfiguration)
-#endif
} // namespace tests
} // namespace ndncert