Skip to content

Commit 37c95cb

Browse files
authored
Merge branch 'sqlc-dev:main' into main
2 parents b09c9cc + 4bf2159 commit 37c95cb

256 files changed

Lines changed: 9287 additions & 620 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.

.github/workflows/buf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ jobs:
44
build:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v5
7+
- uses: actions/checkout@v6
88
- uses: bufbuild/buf-setup-action@v1
99
- uses: bufbuild/buf-lint-action@v1

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
name: build ${{ matrix.os }}
1010
runs-on: ${{ matrix.os }}
1111
steps:
12-
- uses: actions/checkout@v5
12+
- 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
name: test
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- 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 ./...
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
with:
2121
repository: sqlc-dev/sqlc-gen-kotlin
2222
path: kotlin

.github/workflows/ci-python.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
name: test
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- 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 ./...
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
with:
2121
repository: sqlc-dev/sqlc-gen-python
2222
path: python

.github/workflows/ci-typescript.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
name: test
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- 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 ./...
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
with:
2121
repository: sqlc-dev/sqlc-gen-typescript
2222
path: typescript

.github/workflows/ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
name: build ${{ matrix.goos }}/${{ matrix.goarch }}
1414
runs-on: ubuntu-24.04
1515
steps:
16-
- uses: actions/checkout@v5
16+
- 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"
@@ -25,10 +25,10 @@ jobs:
2525
test:
2626
runs-on: ubuntu-24.04
2727
steps:
28-
- uses: actions/checkout@v5
28+
- 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:

.github/workflows/gen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# needed because the postgres container does not provide a healthcheck
1818
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- uses: actions/setup-go@v6
2222
with:
2323
go-version-file: go.mod
@@ -32,7 +32,7 @@ jobs:
3232
PG_PASSWORD: postgres
3333
PG_PORT: ${{ job.services.postgres.ports['5432'] }}
3434
- name: Save results
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v6
3636
with:
3737
name: sqlc-pg-gen-results
3838
path: gen

0 commit comments

Comments
 (0)