Skip to content

Commit 325b16d

Browse files
asmyasnikovasmyasnikov
authored
Merge branch 'sqlc-dev:main' into engine-plugin
2 parents 6b8773a + 054bc91 commit 325b16d

2,843 files changed

Lines changed: 4285 additions & 3281 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/ISSUE_TEMPLATE/BUG_REPORT.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ body:
99
description: What version of sqlc are you running? If you don't know, run `sqlc version`.
1010
multiple: false
1111
options:
12+
- 1.31.1
13+
- 1.31.0
1214
- 1.30.0
1315
- 1.29.0
1416
- 1.28.0

‎.github/workflows/buf.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: buf
2-
on: pull_request
2+
on:
3+
pull_request:
4+
paths-ignore:
5+
- 'docs/**'
6+
- '.readthedocs.yaml'
37
jobs:
48
build:
59
runs-on: ubuntu-latest

‎.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.26.0'
15+
go-version: '1.26.2'
1616
- name: install ./...
1717
run: go build ./...
1818
env:

‎.github/workflows/ci-kotlin.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ on:
33
push:
44
branches:
55
- main
6+
paths-ignore:
7+
- 'docs/**'
8+
- '.readthedocs.yaml'
69
pull_request:
10+
paths-ignore:
11+
- 'docs/**'
12+
- '.readthedocs.yaml'
713
jobs:
814
build:
915
if: false
@@ -13,7 +19,7 @@ jobs:
1319
- uses: actions/checkout@v6
1420
- uses: actions/setup-go@v6
1521
with:
16-
go-version: '1.26.0'
22+
go-version: '1.26.2'
1723
- name: install ./...
1824
run: go install ./...
1925
- uses: actions/checkout@v6

‎.github/workflows/ci-python.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ on:
33
push:
44
branches:
55
- main
6+
paths-ignore:
7+
- 'docs/**'
8+
- '.readthedocs.yaml'
69
pull_request:
10+
paths-ignore:
11+
- 'docs/**'
12+
- '.readthedocs.yaml'
713
jobs:
814
build:
915
if: false
@@ -13,7 +19,7 @@ jobs:
1319
- uses: actions/checkout@v6
1420
- uses: actions/setup-go@v6
1521
with:
16-
go-version: '1.26.0'
22+
go-version: '1.26.2'
1723
- name: install ./...
1824
run: go install ./...
1925
- uses: actions/checkout@v6

‎.github/workflows/ci-typescript.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ on:
33
push:
44
branches:
55
- main
6+
paths-ignore:
7+
- 'docs/**'
8+
- '.readthedocs.yaml'
69
pull_request:
10+
paths-ignore:
11+
- 'docs/**'
12+
- '.readthedocs.yaml'
713
jobs:
814
build:
915
if: false
@@ -13,7 +19,7 @@ jobs:
1319
- uses: actions/checkout@v6
1420
- uses: actions/setup-go@v6
1521
with:
16-
go-version: '1.26.0'
22+
go-version: '1.26.2'
1723
- name: install ./...
1824
run: go install ./...
1925
- uses: actions/checkout@v6

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 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.26.0'
19+
go-version: '1.26.2'
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.26.0'
31+
go-version: '1.26.2'
3232

3333
- name: install gotestsum
3434
run: go install gotest.tools/gotestsum@latest

‎.github/workflows/gen.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@v6
35+
uses: actions/upload-artifact@v7
3636
with:
3737
name: sqlc-pg-gen-results
3838
path: gen

‎.readthedocs.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ build:
1010
os: ubuntu-22.04
1111
tools:
1212
python: "3.11"
13+
jobs:
14+
post_checkout:
15+
# Cancel PR builds that don't touch the docs.
16+
# https://docs.readthedocs.io/en/stable/build-customization.html#cancel-build-based-on-a-condition
17+
- |
18+
if [ "$READTHEDOCS_VERSION_TYPE" = "external" ] && git diff --quiet origin/main -- docs/ .readthedocs.yaml; then
19+
exit 183
20+
fi
1321
1422
# Build documentation in the docs/ directory with Sphinx
1523
sphinx:

‎CLAUDE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This document provides essential information for working with the sqlc codebase,
66

77
### Prerequisites
88

9-
- **Go 1.26.0+** - Required for building and testing
9+
- **Go 1.26.2+** - Required for building and testing
1010
- **Docker & Docker Compose** - Required for integration tests with databases (local development)
1111
- **Git** - For version control
1212

@@ -147,7 +147,7 @@ make start # Start database containers
147147
### GitHub Actions Workflow
148148

149149
- **File:** `.github/workflows/ci.yml`
150-
- **Go Version:** 1.26.0
150+
- **Go Version:** 1.26.2
151151
- **Database Setup:** Uses `sqlc-test-setup` (not Docker) to install and start PostgreSQL and MySQL directly on the runner
152152
- **Test Command:** `gotestsum --junitfile junit.xml -- --tags=examples -timeout 20m ./...`
153153
- **Additional Checks:** `govulncheck` for vulnerability scanning

0 commit comments

Comments
 (0)