diff --git a/.github/workflows/psql.yml b/.github/workflows/psql.yml index a7cc1de..aa8200b 100644 --- a/.github/workflows/psql.yml +++ b/.github/workflows/psql.yml @@ -73,7 +73,7 @@ jobs: PLATFORM: "amd64" run: | docker run --rm -v .:/workspace $CACHE_ENVS $PGRX_IMAGE build --lib --features pg${{ matrix.version }} --target ${{ matrix.arch }}-unknown-linux-gnu --profile opt - docker run --rm -v .:/workspace $CACHE_ENVS --entrypoint bash $PGRX_IMAGE ./tools/schema.sh --features pg${{ matrix.version }} --target ${{ matrix.arch }}-unknown-linux-gnu --profile opt | expand -t 4 > ./target/schema.sql + docker run --rm -v .:/workspace $CACHE_ENVS --entrypoint bash $PGRX_IMAGE ./tools/schema.sh --features pg${{ matrix.version }} --target ${{ matrix.arch }}-unknown-linux-gnu --profile opt ./tools/package.sh docker build -t rabbithole:pg${{ matrix.version }} --build-arg PG_VERSION=${{ matrix.version }} -f ./docker/Dockerfile . diff --git a/bench/README.md b/bench/README.md index d55e7e8..ad8e6e3 100644 --- a/bench/README.md +++ b/bench/README.md @@ -5,7 +5,7 @@ sudo apt install -y build-essential libreadline-dev zlib1g-dev flex bison libxml cargo install --locked cargo-pgrx cargo pgrx init cargo build --package rabbithole --lib --features pg16 --target x86_64-unknown-linux-gnu --release -./tools/schema.sh --features pg16 --target x86_64-unknown-linux-gnu --release | expand -t 4 > ./target/schema.sql +./tools/schema.sh --features pg16 --target x86_64-unknown-linux-gnu --release export SEMVER="0.0.0" export VERSION="16" diff --git a/tools/schema.sh b/tools/schema.sh index 1d868ad..33b2a2c 100755 --- a/tools/schema.sh +++ b/tools/schema.sh @@ -44,4 +44,4 @@ CONTROL_FILEPATH="./rabbithole.control" SO_FILEPATH="$DIR/librabbithole.so" $(di PGRX_EMBED=$code cargo rustc --package rabbithole --bin pgrx_embed_rabbithole "$@" -- --cfg pgrx_embed -CARGO_PKG_VERSION="0.0.0" QEMU_LD_PREFIX=$QEMU_LD_PREFIX "${RUNNER[@]}" "$DIR/pgrx_embed_rabbithole" | expand -t 4 \ No newline at end of file +CARGO_PKG_VERSION="0.0.0" QEMU_LD_PREFIX=$QEMU_LD_PREFIX "${RUNNER[@]}" "$DIR/pgrx_embed_rabbithole" | expand -t 4 > ./target/schema.sql