Skip to content

Commit

Permalink
Merge pull request prisma#2523 from prisma/prepare-master-to-main
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhoule authored Jan 4, 2022
2 parents ccf3dc9 + 4871f62 commit 4c48db5
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .buildkite/engineer
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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.32/latest/$OS/engineer.gz" --output engineer.gz
curl --fail -sSL "https://prisma-engineer.s3-eu-west-1.amazonaws.com/1.33/latest/$OS/engineer.gz" --output engineer.gz
gzip -d engineer.gz
chmod +x engineer

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: WASM build
on:
push:
branches:
- master
- main
pull_request:
jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cargo-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
inputs: # null
push:
branches:
- master
- main
jobs:
generate-cargo-docs:
name: "Generate cargo docs for the workspace"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Formatting
on:
push:
branches:
- master
- main
pull_request:
jobs:
clippy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/migration-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Introspection Engine + Migration Engine + sql_schema_describer
on:
push:
branches:
- master
- main
pull_request:
jobs:
test-mongodb-introspection-and-migration-connector:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/query-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Query Engine
on:
push:
branches:
- master
- main
pull_request:
jobs:
rust-vitess-tests:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Unit tests
on:
push:
branches:
- master
- main
pull_request:
jobs:
test:
Expand Down

0 comments on commit 4c48db5

Please sign in to comment.