Skip to content

Commit ee8ace3

Browse files
authored
Merge branch 'main' into fix/sql-default-expr
2 parents 447aaff + 94a226b commit ee8ace3

192 files changed

Lines changed: 7461 additions & 991 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: PR Code Security
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
jobs:
8+
secret-detection:
9+
name: Secret Detection
10+
uses: prisma/.github/.github/workflows/secret_detection.yml@main
11+
secrets: inherit
12+
code-scanning:
13+
name: Code Scanning
14+
uses: prisma/.github/.github/workflows/code_scanning.yml@main

.github/workflows/test-query-compiler-template.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ jobs:
7676
username: ${{ secrets.DOCKERHUB_USERNAME }}
7777
password: ${{ secrets.DOCKERHUB_TOKEN }}
7878

79-
- name: Cache Docker images.
80-
uses: ScribeMD/docker-cache@0.5.0
81-
with:
82-
key: docker-${{ inputs.setup_task }}-${{hashFiles('docker-compose.yaml')}}
83-
8479
- name: Set Prisma branch
8580
id: set-prisma-branch
8681
run: |

.github/workflows/test-schema-engine-linux-template.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ jobs:
4444
username: ${{ secrets.DOCKERHUB_USERNAME }}
4545
password: ${{ secrets.DOCKERHUB_TOKEN }}
4646

47-
- name: Cache Docker images.
48-
uses: ScribeMD/docker-cache@0.5.0
49-
with:
50-
key: docker-${{ inputs.database_name }}-${{ hashFiles('docker-compose.yaml') }}
51-
5247
#
5348
# Multithreaded tests
5449
#

.github/workflows/test-schema-engine.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ jobs:
4646
username: ${{ secrets.DOCKERHUB_USERNAME }}
4747
password: ${{ secrets.DOCKERHUB_TOKEN }}
4848

49-
- name: Cache Docker images.
50-
uses: ScribeMD/docker-cache@0.5.0
51-
with:
52-
key: docker-${{ matrix.database.name }}-${{hashFiles('docker-compose.yaml')}}
53-
5449
- name: 'Start ${{ matrix.database.name }}'
5550
run: make start-${{ matrix.database.name }}-single
5651

0 commit comments

Comments
 (0)