Skip to content

Commit f4a1810

Browse files
ivanauthivanauth
committed
Merge branch 'main' into feat/issue-2066-underscore-prefix-identifiers
Resolve merge conflict in pkg/schemadsl/lexer/lex_test.go by keeping both underscore prefix tests and unicode/singlequoted string tests.
2 parents 1096f00 + dbd2687 commit f4a1810

File tree

366 files changed

+21308
-7679
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

366 files changed

+21308
-7679
lines changed

‎.github/workflows/benchmark.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
runs-on: "depot-ubuntu-24.04-4"
1515
timeout-minutes: 15
1616
steps:
17-
- uses: "actions/checkout@v5.0.0"
17+
- uses: "actions/checkout@v6"
1818
with:
1919
fetch-depth: 0
2020

21-
- uses: "actions/setup-go@v6.0.0"
21+
- uses: "actions/setup-go@v6.1.0"
2222
with:
2323
go-version-file: "./go.mod"
2424
cache-dependency-path: "./go.sum"
@@ -48,7 +48,7 @@ jobs:
4848
id: "system-info"
4949

5050
- name: "Save benchmark JSON"
51-
uses: "actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830" # v4.3.0
51+
uses: "actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb" # v5.0.1
5252
with:
5353
path: "./cache/benchmark-data.json"
5454
# Save with commit hash to avoid "cache already exists"

‎.github/workflows/build-test.yaml‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ env:
1717
DOCKERHUB_PUBLIC_USER: "spicedbgithubactions"
1818
jobs:
1919
paths-filter:
20-
runs-on: "depot-ubuntu-24.04-small"
20+
runs-on: "depot-ubuntu-24.04-arm-small"
2121
outputs:
2222
codechange: "${{ steps.code-filter.outputs.codechange }}"
2323
protochange: "${{ steps.proto-filter.outputs.protochange }}"
2424
steps:
25-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
25+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
2626
- uses: "dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36" # v3.0.2
2727
id: "code-filter"
2828
with:
@@ -47,12 +47,12 @@ jobs:
4747
- "go.mod"
4848
build:
4949
name: "Build Binary & Image"
50-
runs-on: "depot-ubuntu-24.04-4"
50+
runs-on: "depot-ubuntu-24.04-arm-4"
5151
needs: "paths-filter"
5252
if: |
5353
needs.paths-filter.outputs.codechange == 'true'
5454
steps:
55-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
55+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
5656
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
5757
- uses: "docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef" # v3.6.0
5858
with:
@@ -66,30 +66,30 @@ jobs:
6666

6767
unit:
6868
name: "Unit"
69-
runs-on: "depot-ubuntu-24.04-4"
69+
runs-on: "depot-ubuntu-24.04-arm-4"
7070
needs: "paths-filter"
7171
if: |
7272
needs.paths-filter.outputs.codechange == 'true'
7373
steps:
74-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
74+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
7575
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
7676
- name: "Unit tests with coverage"
7777
run: "go run mage.go test:unitCover"
7878
- name: "Coverage"
79-
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
79+
uses: "codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de" # v5.5.2
8080
with:
8181
files: "./coverage.txt"
8282
token: "${{ secrets.CODECOV_TOKEN }}"
8383
fail_ci_if_error: false
8484

8585
steelthread:
8686
name: "Steelthread"
87-
runs-on: "depot-ubuntu-24.04-4"
87+
runs-on: "depot-ubuntu-24.04-arm-4"
8888
needs: "paths-filter"
8989
if: |
9090
needs.paths-filter.outputs.codechange == 'true'
9191
steps:
92-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
92+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
9393
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
9494
- name: "Steelthread tests"
9595
run: "go run mage.go test:steelthread"
@@ -101,7 +101,7 @@ jobs:
101101
if: |
102102
needs.paths-filter.outputs.codechange == 'true'
103103
steps:
104-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
104+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
105105
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
106106
- uses: "docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef" # v3.6.0
107107
with:
@@ -110,22 +110,22 @@ jobs:
110110
- name: "Integration tests with coverage"
111111
run: "go run mage.go test:integrationCover"
112112
- name: "Coverage"
113-
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
113+
uses: "codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de" # v5.5.2
114114
with:
115115
files: "./coverage.txt"
116116
token: "${{ secrets.CODECOV_TOKEN }}"
117117
fail_ci_if_error: false
118118

119119
datastoreinttest:
120120
name: "Datastore Integration Tests"
121-
runs-on: "depot-ubuntu-24.04-8"
121+
runs-on: "depot-ubuntu-24.04-arm-8"
122122
needs: "paths-filter"
123123
strategy:
124124
fail-fast: false
125125
matrix:
126126
datastore: ["mysql", "spanner"]
127127
steps:
128-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
128+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
129129
if: |
130130
needs.paths-filter.outputs.codechange == 'true'
131131
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
@@ -144,22 +144,22 @@ jobs:
144144
- name: "Coverage"
145145
if: |
146146
needs.paths-filter.outputs.codechange == 'true'
147-
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
147+
uses: "codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de" # v5.5.2
148148
with:
149149
files: "./coverage.txt"
150150
token: "${{ secrets.CODECOV_TOKEN }}"
151151
fail_ci_if_error: false
152152

153153
datastoreconstest:
154154
name: "Datastore Consistency Tests"
155-
runs-on: "depot-ubuntu-24.04-8"
155+
runs-on: "depot-ubuntu-24.04-arm-8"
156156
needs: "paths-filter"
157157
strategy:
158158
fail-fast: false
159159
matrix:
160160
datastore: ["mysql", "spanner"]
161161
steps:
162-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
162+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
163163
if: |
164164
needs.paths-filter.outputs.codechange == 'true'
165165
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
@@ -178,23 +178,23 @@ jobs:
178178
- name: "Coverage"
179179
if: |
180180
needs.paths-filter.outputs.codechange == 'true'
181-
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
181+
uses: "codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de" # v5.5.2
182182
with:
183183
files: "./coverage.txt"
184184
token: "${{ secrets.CODECOV_TOKEN }}"
185185
fail_ci_if_error: false
186186

187187
pgdatastoreinttest:
188188
name: "Datastore Integration Tests"
189-
runs-on: "depot-ubuntu-24.04-4"
189+
runs-on: "depot-ubuntu-24.04-arm-4"
190190
needs: "paths-filter"
191191
strategy:
192192
fail-fast: false
193193
matrix:
194194
datastore: ["postgres", "pgbouncer"]
195195
pgversion: ["13.8", "14", "15", "16", "17"]
196196
steps:
197-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
197+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
198198
if: |
199199
needs.paths-filter.outputs.codechange == 'true'
200200
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
@@ -213,23 +213,23 @@ jobs:
213213
- name: "Coverage"
214214
if: |
215215
needs.paths-filter.outputs.codechange == 'true'
216-
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
216+
uses: "codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de" # v5.5.2
217217
with:
218218
files: "./coverage.txt"
219219
token: "${{ secrets.CODECOV_TOKEN }}"
220220
fail_ci_if_error: false
221221

222222
pgdatastoreconstest:
223223
name: "Datastore Consistency Tests"
224-
runs-on: "depot-ubuntu-24.04-4"
224+
runs-on: "depot-ubuntu-24.04-arm-4"
225225
needs: "paths-filter"
226226
strategy:
227227
fail-fast: false
228228
matrix:
229229
datastore: ["postgres"]
230230
pgversion: ["13.8", "14", "15", "16", "17"]
231231
steps:
232-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
232+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
233233
if: |
234234
needs.paths-filter.outputs.codechange == 'true'
235235
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
@@ -248,7 +248,7 @@ jobs:
248248
- name: "Coverage"
249249
if: |
250250
needs.paths-filter.outputs.codechange == 'true'
251-
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
251+
uses: "codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de" # v5.5.2
252252
with:
253253
files: "./coverage.txt"
254254
token: "${{ secrets.CODECOV_TOKEN }}"
@@ -264,7 +264,7 @@ jobs:
264264
datastore: ["crdb"]
265265
crdbversion: ["25.2.0", "25.3.0"]
266266
steps:
267-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
267+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
268268
if: |
269269
needs.paths-filter.outputs.codechange == 'true'
270270
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
@@ -283,7 +283,7 @@ jobs:
283283
- name: "Coverage"
284284
if: |
285285
needs.paths-filter.outputs.codechange == 'true'
286-
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
286+
uses: "codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de" # v5.5.2
287287
with:
288288
files: "./coverage.txt"
289289
token: "${{ secrets.CODECOV_TOKEN }}"
@@ -299,7 +299,7 @@ jobs:
299299
datastore: ["crdb"]
300300
crdbversion: ["25.2.0", "25.3.0"]
301301
steps:
302-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
302+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
303303
if: |
304304
needs.paths-filter.outputs.codechange == 'true'
305305
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
@@ -318,7 +318,7 @@ jobs:
318318
- name: "Coverage"
319319
if: |
320320
needs.paths-filter.outputs.codechange == 'true'
321-
uses: "codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7" # v5.5.1
321+
uses: "codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de" # v5.5.2
322322
with:
323323
files: "./coverage.txt"
324324
token: "${{ secrets.CODECOV_TOKEN }}"
@@ -335,14 +335,14 @@ jobs:
335335
if: |
336336
needs.paths-filter.outputs.codechange == 'true'
337337
steps:
338-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
338+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
339339
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
340340
with:
341341
go-version-file: "e2e/go.mod"
342342
cache-dependency-path: "e2e/go.sum"
343343
- name: "Run e2e"
344344
run: "go run mage.go test:e2e ${{ matrix.crdbversion }}"
345-
- uses: "actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4" # v5.0.0
345+
- uses: "actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f" # v6.0.0
346346
if: "always()"
347347
# this upload step is really flaky, don't fail the job if it fails
348348
continue-on-error: true
@@ -351,12 +351,12 @@ jobs:
351351
path: "e2e/newenemy/*.log"
352352
analyzers-unit-tests:
353353
name: "Analyzers Unit Tests"
354-
runs-on: "depot-ubuntu-24.04-small"
354+
runs-on: "depot-ubuntu-24.04-arm-small"
355355
needs: "paths-filter"
356356
if: |
357357
needs.paths-filter.outputs.codechange == 'true'
358358
steps:
359-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
359+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
360360
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
361361
with:
362362
go-version-file: "tools/analyzers/go.mod"
@@ -365,12 +365,12 @@ jobs:
365365
run: "go run mage.go test:analyzers"
366366
development:
367367
name: "WASM Tests"
368-
runs-on: "depot-ubuntu-24.04-4"
368+
runs-on: "depot-ubuntu-24.04-arm-8"
369369
needs: "paths-filter"
370370
if: |
371371
needs.paths-filter.outputs.codechange == 'true'
372372
steps:
373-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
373+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
374374
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
375375
- name: "Disable AppArmor"
376376
if:
@@ -391,16 +391,16 @@ jobs:
391391

392392
protobuf:
393393
name: "Generate Protobufs"
394-
runs-on: "depot-ubuntu-24.04-small"
394+
runs-on: "depot-ubuntu-24.04-arm-small"
395395
needs: "paths-filter"
396396
if: |
397397
needs.paths-filter.outputs.protochange == 'true'
398398
steps:
399-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
399+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
400400
- uses: "authzed/actions/setup-go@6cde6aeb82fab36d8383c2f55bed8128955af34d" # main
401401
- name: "Generate Protos"
402402
run: "go run mage.go gen:proto"
403-
- uses: "chainguard-dev/actions/nodiff@1b32103f5aa389c31ab0be75a8edc38d7e4750d8" # main
403+
- uses: "chainguard-dev/actions/nodiff@3e8a2a226fad9e1ecbf2d359b8a7697554a4ac6d" # main
404404
with:
405405
path: ""
406406
fixup-command: "go run mage.go gen:proto"
@@ -417,19 +417,20 @@ jobs:
417417

418418
benchmarks:
419419
name: "Run Go benchmarks"
420-
runs-on: "depot-ubuntu-24.04-8"
420+
runs-on: "depot-ubuntu-24.04-arm-8"
421421
timeout-minutes: 30
422422
needs: "paths-filter"
423423
# Benchmarks on Main are ran through a different workflow
424424
if: |
425425
needs.paths-filter.outputs.codechange == 'true' &&
426-
github.base_ref != 'main'
426+
github.event_name == 'pull_request' &&
427+
github.base_ref == 'main'
427428
steps:
428-
- uses: "actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493" # v4.2.2
429+
- uses: "actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8" # v4.2.2
429430
with:
430431
fetch-depth: 0
431432

432-
- uses: "actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f" # v5.4.0
433+
- uses: "actions/setup-go@4aaadf42668403795cdfdb15b1c4250e9fed12b9" # v5.4.0
433434
with:
434435
go-version-file: "./go.mod"
435436
cache-dependency-path: "./go.sum"
@@ -451,7 +452,7 @@ jobs:
451452
echo "sha=$SHA" >> $GITHUB_OUTPUT
452453
453454
- name: "Download benchmark from Main"
454-
uses: "actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830" # v4.3.0
455+
uses: "actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb" # v5.0.1
455456
id: "downloadbenchmark"
456457
with:
457458
path: "./cache/benchmark-data.json"

0 commit comments

Comments
 (0)