Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into ie/multi-schema-crash-2
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhoule committed Nov 25, 2022
2 parents a8c39ef + 22cd989 commit c2f5610
Show file tree
Hide file tree
Showing 562 changed files with 23,695 additions and 11,192 deletions.
6 changes: 3 additions & 3 deletions .buildkite/engineer
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ fi
if ! type "engineer" > /dev/null; then
# Setup Prisma engine build & test tool (engineer).
set -e
curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.41/latest/$OS/engineer.gz" --output engineer.gz
curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.42/latest/$OS/engineer.gz" --output engineer.gz
gzip -d engineer.gz
chmod +x engineer

# Execute passed command and clean up
./engineer $@
./engineer "$@"
rm -rf ./engineer
else
# Already installed on the system
set -e
engineer $@
engineer "$@"
fi
1 change: 0 additions & 1 deletion .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export PRISMA_BINARY_PATH=$(pwd)/target/release/query-engine
### QE config vars, set to testing values ###
export SQLITE_MAX_VARIABLE_NUMBER=250000 # This must be in sync with the setting in the engineer build CLI
export QUERY_BATCH_SIZE=10 # Max size of IN statement vars.
export CLOSED_TX_CLEANUP=2 # Time in seconds when a closed interactive transaction will be removed from the cache.

### QE test setup vars ###
export LOG_LEVEL=trace
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,9 @@ jobs:
override: true
- name: Check formatting
run: cargo fmt -- --check
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
2 changes: 1 addition & 1 deletion .github/workflows/publish-prisma-fmt-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# Publish
#

- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: '14.x'

Expand Down

0 comments on commit c2f5610

Please sign in to comment.