summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-05-07 19:52:31 +0100
committerSadie Powell <sadie@witchery.services>2021-05-07 20:13:55 +0100
commitd848034590bc402277da975b7efdbc78ce1722fc (patch)
tree98ece3291feacb2aa1b61cf5928bf638d6807828
parent876d6d3afe5b936d585159b6c4f444aed808b5b6 (diff)
Switch from the Ubuntu 16.04 image to the 18.04 Ubuntu image.
The Argon2 PPA is broken again and I don't want to deal with the stress of working out why. The 16.04 image is EOL soon (see actions/virtual-environments/#1084) so switching off it is just easier.
-rw-r--r--.github/workflows/ci-linux.yml4
-rw-r--r--src/modules/extra/m_regex_re2.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index a622bbc0a..9d3365e53 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -4,7 +4,7 @@ on:
- push
jobs:
build:
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-18.04
env:
CXXFLAGS: -std=${{ matrix.standard }}
TEST_BUILD_MODULES: argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 regex_stdlib regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal
@@ -14,7 +14,7 @@ jobs:
run: |
sudo apt-get update --assume-yes
sudo apt-get install --assume-yes --no-install-recommends clang g++ git make libc++-dev libc++abi-dev pkg-config
- sudo apt-get install --assume-yes --no-install-recommends libargon2-dev libgnutls28-dev libldap2-dev libmaxminddb-dev libmbedtls-dev libmysqlclient-dev libpcre3-dev libpq-dev libre2-dev libsqlite3-dev libssl-dev libtre-dev
+ sudo apt-get install --assume-yes --no-install-recommends libargon2-0-dev libgnutls28-dev libldap2-dev libmaxminddb-dev libmbedtls-dev libmysqlclient-dev libpcre3-dev libpq-dev libre2-dev libsqlite3-dev libssl-dev libtre-dev
- name: Run test-build
run: ./tools/test-build ${{ matrix.compiler }}
strategy:
diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp
index 35414baf1..e3e793d6d 100644
--- a/src/modules/extra/m_regex_re2.cpp
+++ b/src/modules/extra/m_regex_re2.cpp
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/// $CompilerFlags: find_compiler_flags("re2" "")
+/// $CompilerFlags: find_compiler_flags("re2" "-std=c++11")
/// $LinkerFlags: find_linker_flags("re2" "-lre2")
/// $PackageInfo: require_system("arch") pkgconf re2