File tree Expand file tree Collapse file tree 2 files changed +37
-1
lines changed Expand file tree Collapse file tree 2 files changed +37
-1
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ postgres_major:
1212postgres_release :
1313 # postgres15: "15.8.1.003-staging-5"
1414 # postgres16: "16.3.1.000-staging-5"
15- postgresorioledb-16 : " orioledb-16.3.1.000-staging-11 "
15+ postgresorioledb-16 : " orioledb-16.3.1.000-staging-12 "
1616
1717# Non Postgres Extensions
1818pgbouncer_release : " 1.19.0"
Original file line number Diff line number Diff line change @@ -49,10 +49,46 @@ buildPgrxExtension_0_12_6 rec {
4949 CARGO_BUILD_JOBS = "2" ;
5050 CARGO = "${ cargo } /bin/cargo" ;
5151
52+ #CARGO_NET_GIT_FETCH_WITH_CLI = "true";
5253 cargoLock = {
5354 lockFile = "${ src } /Cargo.lock" ;
5455 allowBuiltinFetchGit = true ;
5556 } ;
57+
58+ preConfigure = ''
59+ cd wrappers
60+
61+ # update the clickhouse-rs dependency
62+ # append the branch name to the git URL to help cargo locate the commit
63+ # while maintaining the rev for reproducibility
64+ awk -i inplace '
65+ /\[dependencies.clickhouse-rs\]/ {
66+ print
67+ getline
68+ if ($0 ~ /git =/) {
69+ print "git = \"https://github.com/suharev7/clickhouse-rs/async-await\""
70+ } else {
71+ print
72+ }
73+ while ($0 !~ /^\[/ && NF > 0) {
74+ getline
75+ if ($0 ~ /rev =/) print
76+ if ($0 ~ /^\[/) print
77+ }
78+ next
79+ }
80+ { print }
81+ ' Cargo.toml
82+
83+ # Verify the file is still valid TOML, break build with this error
84+ # if it is not
85+ if ! cargo verify-project 2>/dev/null; then
86+ echo "Failed to maintain valid TOML syntax"
87+ exit 1
88+ fi
89+
90+ cd ..
91+ '' ;
5692
5793 buildAndTestSubdir = "wrappers" ;
5894 buildFeatures = [
You can’t perform that action at this time.
0 commit comments