Skip to content

Commit 20490de

Browse files
victoraugustollsvictoraugustolls
committed
chore: merged main
2 parents 9e78f31 + 7761663 commit 20490de

File tree

395 files changed

+8419
-3017
lines changed

Some content is hidden

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

395 files changed

+8419
-3017
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
name: gradle
2-
on: [push, pull_request]
1+
name: kotlin
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
37
jobs:
48

59
build:
@@ -27,9 +31,10 @@ jobs:
2731

2832
steps:
2933
- uses: actions/checkout@v2
30-
- uses: actions/setup-java@v1
34+
- uses: actions/setup-java@v2
3135
with:
32-
java-version: 11
36+
distribution: 'adopt'
37+
java-version: '11'
3338
- uses: eskatos/gradle-command-action@v1
3439
env:
3540
PG_USER: postgres

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: python
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
jobs:
8+
9+
build:
10+
name: test
11+
runs-on: ubuntu-latest
12+
13+
services:
14+
postgres:
15+
image: postgres:11
16+
env:
17+
POSTGRES_USER: postgres
18+
POSTGRES_PASSWORD: postgres
19+
POSTGRES_DB: postgres
20+
ports:
21+
- 5432:5432
22+
# needed because the postgres container does not provide a healthcheck
23+
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
24+
25+
steps:
26+
- uses: actions/checkout@v2
27+
- uses: actions/setup-python@v2
28+
with:
29+
python-version: 3.9
30+
- name: Install python dependencies
31+
working-directory: ./examples/python
32+
run: |
33+
python -m pip install --upgrade pip
34+
python -m pip install -r requirements.txt
35+
- name: Test python code
36+
working-directory: ./examples/python
37+
env:
38+
PG_USER: postgres
39+
PG_HOST: localhost
40+
PG_DATABASE: postgres
41+
PG_PASSWORD: postgres
42+
PG_PORT: ${{ job.services.postgres.ports['5432'] }}
43+
run: |
44+
pytest src/tests

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: go
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
37
jobs:
48

59
build:
@@ -28,10 +32,9 @@ jobs:
2832
steps:
2933
- uses: actions/checkout@v2
3034

31-
- name: Set up Go 1.14
32-
uses: actions/setup-go@v2
35+
- uses: actions/setup-go@v2
3336
with:
34-
go-version: '1.14'
37+
go-version: '1.16'
3538

3639
- run: go build ./...
3740
working-directory: internal/endtoend/testdata

‎.github/workflows/equinox.yml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,29 @@ on:
77

88
jobs:
99

10-
benchmark:
11-
runs-on: ubuntu-latest
10+
windows:
11+
name: release --platforms windows
12+
runs-on: windows-latest
1213
steps:
1314
- uses: actions/checkout@v2
14-
- name: Set up Go 1.14
15-
uses: actions/setup-go@v2
15+
- uses: actions/setup-go@v2
1616
with:
17-
go-version: '1.14'
18-
- uses: equinox-io/setup@master
19-
- run: go test -bench . -json -benchmem -run=XXX ./...
17+
go-version: '1.16'
18+
- uses: equinox-io/setup-release-tool@v1.1.0
19+
- name: equinox release
20+
env:
21+
EQUINOX_API_TOKEN: ${{ secrets.EQUINOX_API_TOKEN }}
22+
EQUINOX_SIGNING_KEY: ${{ secrets.EQUINOX_SIGNING_KEY }}
23+
run: go run scripts/release.go -draft windows_amd64
2024

2125
macos:
2226
name: release --platforms darwin
2327
runs-on: macos-latest
2428
steps:
2529
- uses: actions/checkout@v2
26-
- name: Set up Go 1.14
27-
uses: actions/setup-go@v2
30+
- uses: actions/setup-go@v2
2831
with:
29-
go-version: '1.14'
32+
go-version: '1.16'
3033
- uses: equinox-io/setup-release-tool@v1.1.0
3134
- name: equinox release
3235
env:
@@ -37,13 +40,12 @@ jobs:
3740
linux:
3841
name: release --platforms linux
3942
runs-on: ubuntu-latest
40-
needs: [macos, benchmark]
43+
needs: [macos, windows]
4144
steps:
4245
- uses: actions/checkout@v2
43-
- name: Set up Go 1.14
44-
uses: actions/setup-go@v2
46+
- uses: actions/setup-go@v2
4547
with:
46-
go-version: '1.14'
48+
go-version: '1.16'
4749
- uses: equinox-io/setup-release-tool@v1.1.0
4850
- name: equinox release
4951
env:

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# STEP 1: Build sqlc
2-
FROM golang:1.15.6 AS builder
2+
FROM golang:1.16.3 AS builder
33

44
COPY . /workspace
55
WORKDIR /workspace

0 commit comments

Comments
 (0)