From 5c47343b4011e64f841f08a8c49e1875474f94cc Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Mon, 5 Jul 2021 19:45:25 +0100 Subject: [PATCH 1/2] Fix deprecation warnings with libpqxx usage --- src/hydra-evaluator/hydra-evaluator.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/hydra-evaluator/hydra-evaluator.cc b/src/hydra-evaluator/hydra-evaluator.cc index 9a852536..2d7e68d9 100644 --- a/src/hydra-evaluator/hydra-evaluator.cc +++ b/src/hydra-evaluator/hydra-evaluator.cc @@ -233,12 +233,12 @@ struct Evaluator pqxx::work txn(*conn); if (jobset.evaluation_style == EvaluationStyle::ONE_AT_A_TIME) { - auto evaluation_res = txn.parameterized + auto evaluation_res = txn.exec_params ("select id from JobsetEvals " "where jobset_id = $1 " - "order by id desc limit 1") - (jobset.name.id) - .exec(); + "order by id desc limit 1" + ,jobset.name.id + ); if (evaluation_res.empty()) { // First evaluation, so allow scheduling. @@ -249,15 +249,15 @@ struct Evaluator auto evaluation_id = evaluation_res[0][0].as(); - auto unfinished_build_res = txn.parameterized + auto unfinished_build_res = txn.exec_params ("select id from Builds " "join JobsetEvalMembers " " on (JobsetEvalMembers.build = Builds.id) " "where JobsetEvalMembers.eval = $1 " " and builds.finished = 0 " - " limit 1") - (evaluation_id) - .exec(); + " limit 1" + ,evaluation_id + ); // If the previous evaluation has no unfinished builds // schedule! From b63dfb7ad4f0ba701d838ec8cde96c6f0c586f2d Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Mon, 5 Jul 2021 19:47:58 +0100 Subject: [PATCH 2/2] Rename version to version.txt is a standard header with C++20 which could cause issues if a library checks it exists then imports it Because we have the root of this repo in the include path, it'd see that exists (with, e.g., __has_include), and then try to include it as a header But because it's just a file that says 0.1, this would fail This happens with libpqxx 7 --- configure.ac | 2 +- flake.nix | 2 +- version => version.txt | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename version => version.txt (100%) diff --git a/configure.ac b/configure.ac index 2fb175c8..9a32651e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Hydra], [m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX])]) +AC_INIT([Hydra], [m4_esyscmd([echo -n $(cat ./version.txt)$VERSION_SUFFIX])]) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([foreign serial-tests]) diff --git a/flake.nix b/flake.nix index 334119ce..25aaa1aa 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ outputs = { self, nixpkgs, nix }: let - version = "${builtins.readFile ./version}.${builtins.substring 0 8 self.lastModifiedDate}.${self.shortRev or "DIRTY"}"; + version = "${builtins.readFile ./version.txt}.${builtins.substring 0 8 self.lastModifiedDate}.${self.shortRev or "DIRTY"}"; pkgs = import nixpkgs { system = "x86_64-linux"; diff --git a/version b/version.txt similarity index 100% rename from version rename to version.txt