Skip to content

Commit eedd52c

Browse files
authored
Merge branch 'sqlc-dev:main' into engine-plugin
2 parents 7f8f44e + ce83d3f commit eedd52c

File tree

12 files changed

+841
-249
lines changed

12 files changed

+841
-249
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v6
1313
- uses: actions/setup-go@v6
1414
with:
15-
go-version: '1.25.0'
15+
go-version: '1.26.0'
1616
- name: install ./...
1717
run: go build ./...
1818
env:

.github/workflows/ci-kotlin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v6
1414
- uses: actions/setup-go@v6
1515
with:
16-
go-version: '1.24.1'
16+
go-version: '1.26.0'
1717
- name: install ./...
1818
run: go install ./...
1919
- uses: actions/checkout@v6

.github/workflows/ci-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v6
1414
- uses: actions/setup-go@v6
1515
with:
16-
go-version: '1.24.1'
16+
go-version: '1.26.0'
1717
- name: install ./...
1818
run: go install ./...
1919
- uses: actions/checkout@v6

.github/workflows/ci-typescript.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v6
1414
- uses: actions/setup-go@v6
1515
with:
16-
go-version: '1.24.1'
16+
go-version: '1.26.0'
1717
- name: install ./...
1818
run: go install ./...
1919
- uses: actions/checkout@v6

.github/workflows/ci.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v6
1717
- uses: actions/setup-go@v6
1818
with:
19-
go-version: '1.25.0'
19+
go-version: '1.26.0'
2020
- run: go build ./...
2121
env:
2222
CGO_ENABLED: "0"
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@v6
2929
- uses: actions/setup-go@v6
3030
with:
31-
go-version: '1.25.0'
31+
go-version: '1.26.0'
3232

3333
- name: install gotestsum
3434
run: go install gotest.tools/gotestsum@latest
@@ -50,13 +50,20 @@ jobs:
5050
env:
5151
CGO_ENABLED: "0"
5252

53+
- name: install databases
54+
run: go run ./cmd/sqlc-test-setup install
55+
56+
- name: start databases
57+
run: go run ./cmd/sqlc-test-setup start
58+
5359
- name: test ./...
54-
run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...
55-
if: ${{ matrix.os }} != "windows-2022"
60+
run: gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m -failfast ./...
5661
env:
5762
CI_SQLC_PROJECT_ID: ${{ secrets.CI_SQLC_PROJECT_ID }}
5863
CI_SQLC_AUTH_TOKEN: ${{ secrets.CI_SQLC_AUTH_TOKEN }}
5964
SQLC_AUTH_TOKEN: ${{ secrets.CI_SQLC_AUTH_TOKEN }}
65+
POSTGRESQL_SERVER_URI: "postgres://postgres:postgres@127.0.0.1:5432/postgres?sslmode=disable"
66+
MYSQL_SERVER_URI: "root:mysecretpassword@tcp(127.0.0.1:3306)/mysql?multiStatements=true&parseTime=true"
6067
CGO_ENABLED: "0"
6168

6269
vuln_check:

0 commit comments

Comments
 (0)