Skip to content

Commit

Permalink
Merge branch 'main' into feat/typed-sql-list-param
Browse files Browse the repository at this point in the history
  • Loading branch information
jkomyno authored Nov 21, 2024
2 parents 808e90b + 5b155e0 commit 79d55c5
Show file tree
Hide file tree
Showing 211 changed files with 4,407 additions and 3,204 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build-engines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,13 @@ jobs:
if: ${{ github.event_name == 'pull_request' }}
run: |
echo "Pull Request: ${{ github.event.pull_request.number }}"
echo "Repository Owner: $${{ github.repository_owner }}"
echo "Repository Owner: ${{ github.repository_owner }}"
echo "Pull Request Author: ${{ github.actor }}"
echo "Pull Request Author Association: ${{ github.event.pull_request.author_association }}"
echo "Commit message:${{ steps.commit-msg.outputs.commit-msg }}"
cat <<END_OF_COMMIT_MESSAGE
Commit message:
${{ steps.commit-msg.outputs.commit-msg }}
END_OF_COMMIT_MESSAGE
echo "Commit message contains [integration]: ${{ contains(steps.commit-msg.outputs.commit-msg, '[integration]') }}"
- name: 'Check if commit message conatains `[integration]` and the PR author has permissions to trigger the workflow'
Expand All @@ -69,6 +72,7 @@ jobs:
(
github.event.pull_request.author_association == 'OWNER' ||
github.event.pull_request.author_association == 'MEMBER' ||
github.event.pull_request.author_association == 'CONTRIBUTOR' ||
github.event.pull_request.author_association == 'COLLABORATOR'
)
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/include/rust-wasm-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
shell: bash
run: |
cargo binstall -y \
[email protected].92 \
[email protected].93 \
[email protected]
- name: Install bc
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/test-query-engine-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ on:
version:
type: string
required: true
ubuntu:
type: string
default: 'latest'
single_threaded:
type: boolean
default: false
Expand Down Expand Up @@ -46,7 +49,9 @@ jobs:
PRISMA_ENGINE_PROTOCOL: ${{ matrix.engine_protocol }}
PRISMA_RELATION_LOAD_STRATEGY: ${{ matrix.relation_load_strategy }}

runs-on: ubuntu-latest
runs-on: "ubuntu-20.04"
# TODO: Replace with the following once `[email protected]` is released.
# runs-on: "ubuntu-${{ inputs.ubuntu }}"
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-query-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,13 @@ jobs:
version: "2019"
- name: "mssql_2017"
version: "2017"
ubuntu: "20.04"
uses: ./.github/workflows/test-query-engine-template.yml
name: mssql ${{ matrix.database.version }}
with:
name: ${{ matrix.database.name }}
version: ${{ matrix.database.version }}
ubuntu: ${{ matrix.database.ubuntu }}
connector: "sqlserver"
relation_load_strategy: '["query"]'

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test-schema-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
database:
- name: mssql_2017
url: "sqlserver://localhost:1434;database=master;user=SA;password=<YourStrong@Passw0rd>;trustServerCertificate=true;socket_timeout=60;isolationLevel=READ UNCOMMITTED"
ubuntu: "20.04"
- name: mssql_2019
url: "sqlserver://localhost:1433;database=master;user=SA;password=<YourStrong@Passw0rd>;trustServerCertificate=true;socket_timeout=60;isolationLevel=READ UNCOMMITTED"
- name: mssql_2022
Expand Down Expand Up @@ -104,7 +105,9 @@ jobs:
is_vitess: true
single_threaded: true

runs-on: ubuntu-latest
runs-on: "ubuntu-20.04"
# TODO: Replace with the following once `[email protected]` is released.
# runs-on: "ubuntu-${{ matrix.database.ubuntu || 'latest' }}"
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/utils/constructDockerBuildCommand.sh
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
#!/bin/bash
set -eux;

# full command
DOCKER_WORKSPACE="/root/build"

# Full command, Docker + Bash.
# In Bash, we use `git config` to avoid "fatal: detected dubious ownership in repository at /root/build" panic messages
# that can occur when Prisma Engines' `build.rs` scripts run `git rev-parse HEAD` to extract the current commit hash.
# See: https://www.kenmuse.com/blog/avoiding-dubious-ownership-in-dev-containers/.
command="docker run \
-e SQLITE_MAX_VARIABLE_NUMBER=250000 \
-e SQLITE_MAX_EXPR_DEPTH=10000 \
-e LIBZ_SYS_STATIC=1 \
-w /root/build \
-v \"$(pwd)\":/root/build \
-w ${DOCKER_WORKSPACE} \
-v \"$(pwd)\":${DOCKER_WORKSPACE} \
-v \"$HOME\"/.cargo/bin:/root/cargo/bin \
-v \"$HOME\"/.cargo/registry/index:/root/cargo/registry/index \
-v \"$HOME\"/.cargo/registry/cache:/root/cargo/registry/cache \
-v \"$HOME\"/.cargo/git/db:/root/cargo/git/db \
$IMAGE \
bash -c \
\" \
cargo clean \
git config --global --add safe.directory ${DOCKER_WORKSPACE} \
&& cargo clean \
&& cargo build --release -p query-engine --manifest-path query-engine/query-engine/Cargo.toml $TARGET_STRING $FEATURES_STRING \
&& cargo build --release -p query-engine-node-api --manifest-path query-engine/query-engine-node-api/Cargo.toml $TARGET_STRING $FEATURES_STRING \
&& cargo build --release -p schema-engine-cli --manifest-path schema-engine/cli/Cargo.toml $TARGET_STRING $FEATURES_STRING \
Expand Down
Loading

0 comments on commit 79d55c5

Please sign in to comment.