Skip to content

Commit 396d81d

Browse files
committed
CI run for new parser (ignore)
1 parent 16bfcab commit 396d81d

9 files changed

Lines changed: 9 additions & 9 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN source ~/.cargo/env && \
1313
export RUSTFLAGS="-Ctarget-feature=+lse"; \
1414
fi && \
1515
cd pgdog && \
16-
cargo build --release && \
16+
cargo build --release --features new_parser && \
1717
cd .. && \
1818
cargo build --release -p pgdog-primary-only-tables
1919

benches/bench.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ bench_run() {
4141
local root_dir
4242
root_dir="$(cd "${BENCH_DIR}/.." && pwd)"
4343
echo "Building pgdog (release)..."
44-
cargo build --release --manifest-path "${root_dir}/Cargo.toml"
44+
cargo build --release --features new_parser --manifest-path "${root_dir}/Cargo.toml"
4545
export PGDOG_BIN="${root_dir}/target/release/pgdog"
4646
fi
4747
echo "Binary: $(${PGDOG_BIN} --version 2>&1 || true)"

integration/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function run_pgdog() {
3131
local pid_file="${COMMON_DIR}/pgdog.pid"
3232
local config_file="${COMMON_DIR}/pgdog.config"
3333
if [ -z "${binary}" ]; then
34-
cargo build
34+
cargo build --features new_parser
3535
binary="target/debug/pgdog"
3636
fi
3737
if [ -f "${pid_file}" ]; then

integration/dev-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source ${THIS_SCRIPT_DIR}/setup.sh
55
source ${THIS_SCRIPT_DIR}/toxi/setup.sh
66
pushd ${THIS_SCRIPT_DIR}/../
77
export NODE_ID=pgdog-dev-1
8-
CMD="cargo run -- --config ${THIS_SCRIPT_DIR}/pgdog.toml --users ${THIS_SCRIPT_DIR}/users.toml"
8+
CMD="cargo run -ppgdog --features new_parser -- --config ${THIS_SCRIPT_DIR}/pgdog.toml --users ${THIS_SCRIPT_DIR}/users.toml"
99

1010
if [[ -z "$1" ]]; then
1111
cargo watch --shell "${CMD}"

integration/failover/dev-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ set -e
33
THIS_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
44
source ${THIS_SCRIPT_DIR}/../toxi/setup.sh
55
pushd ${THIS_SCRIPT_DIR}
6-
cargo run
6+
cargo run --features new_parser
77
popd

integration/load_balancer/pgdog.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ set -e
33

44
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
55
pushd ${SCRIPT_DIR}/../../
6-
cargo run -- --config ${SCRIPT_DIR}/pgdog.toml --users ${SCRIPT_DIR}/users.toml
6+
cargo run --features new_parser -- --config ${SCRIPT_DIR}/pgdog.toml --users ${SCRIPT_DIR}/users.toml

integration/logical/log.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
touch log.txt
3-
cargo run > log.txt 2>&1 &
3+
cargo run --features new_parser > log.txt 2>&1 &
44
pid=$!
55

66
trap shutdown INT

integration/two_pc_crash_safety/rspec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def spawn_pgdog(config_dir, wal_dir: nil)
5252
wal_dir ||= Dir.mktmpdir('pgdog_wal_')
5353
binary = ENV['PGDOG_BIN'] || File.expand_path('../../target/release/pgdog', __dir__)
5454
unless File.exist?(binary)
55-
system('cargo', 'build', '--release', chdir: File.expand_path('../..', __dir__)) ||
55+
system('cargo', 'build', '--release', '--features', 'new_parser', chdir: File.expand_path('../..', __dir__)) ||
5656
raise('cargo build failed')
5757
end
5858
log_path = File.join(config_dir, 'pgdog.log')

pgdog/tests/flame/profile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if [ ! -f ${PGDOG_BIN} ]; then
1515
echo "PgDog is not compiled in release mode (target/release/pgdog is missing)"
1616
echo "Please compile PgDog with:"
1717
echo
18-
printf "\tcargo build --release"
18+
printf "\tcargo build --release --features new_parser"
1919
echo
2020
echo
2121
exit 1

0 commit comments

Comments
 (0)