Skip to content

Commit

Permalink
bug userver: build fix for gcc
Browse files Browse the repository at this point in the history
commit_hash:366b63a9a8519c9def6b043815fda50152e50782
  • Loading branch information
segoon committed Jan 27, 2025
1 parent f23ce54 commit a4f3958
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
9 changes: 9 additions & 0 deletions scripts/docker/ubuntu-24.04-base.dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
FROM ubuntu:24.04

# Build as:
#
# docker build -f scripts/docker/ubuntu-24.04-base.dockerfile
#
# The Dockerfile setups:
# * all userver build dependencies
# * all userver test dependencies (e.g. for testsuite)
# It does not contain userver itself.

COPY scripts/docs/en/deps/ubuntu-24.04.md /userver_tmp/
COPY scripts/postgres/ubuntu-install-postgresql-includes.sh /userver_tmp/

Expand Down
2 changes: 1 addition & 1 deletion scripts/postgres/ubuntu-install-postgresql-includes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euox pipefail

POSTGRESQL_VERSION=${POSTGRESQL_VERSION:=16}

apt remove postgresql-server-dev-${POSTGRESQL_VERSION}
apt remove -y postgresql-server-dev-${POSTGRESQL_VERSION}

# Installing postgresql-server-dev-14 without dependencies
#
Expand Down
2 changes: 1 addition & 1 deletion universal/utest/src/utest/log_capture_fixture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ LogRecord GetSingleLog(utils::span<const LogRecord> log, const utils::impl::Sour
}
throw NotSingleLogError(msg);
}
auto single_record = std::move(log[0]);
auto single_record = log[0];
return single_record;
}

Expand Down

0 comments on commit a4f3958

Please sign in to comment.