Skip to content

Commit de39d21

Browse files
authored
Merge pull request #753 from ydb-platform/fix-ex-ci
fix examples CI
2 parents 9f15b84 + 3d8eee2 commit de39d21

File tree

2 files changed

+21
-39
lines changed

2 files changed

+21
-39
lines changed

.github/workflows/examples.yml

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,16 @@ on:
77
pull_request:
88
workflow_dispatch:
99
jobs:
10-
examples:
10+
basic-ydb:
1111
concurrency:
12-
group: examples-${{ github.ref }}-${{ matrix.go-version }}-${{ matrix.ydb-version }}-${{ matrix.driver }}
12+
group: basic-ydb-${{ github.ref }}-${{ matrix.ydb-version }}-${{ matrix.application }}
1313
cancel-in-progress: true
1414
runs-on: ubuntu-latest
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
go-version: [ 1.17.x, 1.18.x, 1.19.x, 1.20.x ]
19-
ydb-version: [ 22.5, 23.1, 23.2 ]
20-
driver: [ native, database_sql, gorm, xorm ]
21-
exclude:
22-
- driver: database_sql
23-
go-version: 1.17.x
24-
- driver: gorm
25-
go-version: 1.17.x
18+
ydb-version: [ 23.1, 23.2 ]
19+
application: [ native, database_sql, gorm, xorm ]
2620
services:
2721
ydb:
2822
image: cr.yandex/yc/yandex-docker-local-ydb:${{ matrix.ydb-version }}-slim
@@ -38,7 +32,6 @@ jobs:
3832
options: '-h localhost'
3933
env:
4034
OS: ubuntu-latest
41-
GO: ${{ matrix.go-version }}
4235
YDB_CONNECTION_STRING: grpc://localhost:2136/local
4336
YDB_ANONYMOUS_CREDENTIALS: 1
4437
steps:
@@ -47,26 +40,25 @@ jobs:
4740
- name: Install Go
4841
uses: actions/setup-go@v3
4942
with:
50-
go-version: ${{ matrix.go-version }}
5143
cache: true
52-
- name: Run examples for ${{ matrix.driver }}
53-
working-directory: ./examples/basic/${{ matrix.driver }}
44+
- name: Run basic example ${{ matrix.application }}
45+
working-directory: ./examples/basic/${{ matrix.application }}
5446
run: go run .
55-
examples-postgres:
47+
basic-postgres:
5648
concurrency:
57-
group: examples-${{ matrix.driver }}-postgres-${{ github.ref }}
49+
group: basic-postgres-${{ matrix.application }}-${{ github.ref }}
5850
cancel-in-progress: true
5951
runs-on: ubuntu-latest
6052
strategy:
6153
fail-fast: false
6254
matrix:
63-
driver: [ gorm, xorm ]
55+
application: [ gorm, xorm ]
6456
services:
6557
postgres:
6658
image: postgres
6759
env:
6860
POSTGRES_PASSWORD: postgres
69-
POSTGRES_DB: examples
61+
POSTGRES_DB: basic
7062
options: >-
7163
--health-cmd pg_isready
7264
--health-interval 5s
@@ -77,39 +69,37 @@ jobs:
7769
env:
7870
OS: ubuntu-latest
7971
GO: 1.20.x
80-
POSTGRES_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/examples?sslmode=disable
72+
POSTGRES_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/basic?sslmode=disable
8173
steps:
8274
- name: Checkout code
8375
uses: actions/checkout@v3
8476
- name: Install Go
8577
uses: actions/setup-go@v3
8678
with:
87-
go-version: 1.20.x
8879
cache: true
89-
- name: Run examples for ${{ matrix.driver }} with postgres
90-
working-directory: ./examples/basic/${{ matrix.driver }}
80+
- name: Run basic example ${{ matrix.application }} with postgres
81+
working-directory: ./examples/basic/${{ matrix.application }}
9182
run: go run .
92-
examples-sqlite:
83+
basic-sqlite:
9384
concurrency:
94-
group: examples-${{ matrix.driver }}-sqlite-${{ github.ref }}
85+
group: basic-sqlite-${{ matrix.application }}-${{ github.ref }}
9586
cancel-in-progress: true
9687
runs-on: ubuntu-latest
9788
strategy:
9889
fail-fast: false
9990
matrix:
100-
driver: [ gorm, xorm ]
91+
application: [ gorm, xorm ]
10192
env:
10293
OS: ubuntu-latest
10394
GO: 1.20.x
104-
SQLITE_CONNECTION_STRING: ${{ matrix.driver }}.db
95+
SQLITE_CONNECTION_STRING: ${{ matrix.application }}.db
10596
steps:
10697
- name: Checkout code
10798
uses: actions/checkout@v3
10899
- name: Install Go
109100
uses: actions/setup-go@v3
110101
with:
111-
go-version: 1.20.x
112102
cache: true
113-
- name: Run examples for ${{ matrix.driver }} with sqlite
114-
working-directory: ./examples/basic/${{ matrix.driver }}
103+
- name: Run basic example ${{ matrix.application }} with sqlite
104+
working-directory: ./examples/basic/${{ matrix.application }}
115105
run: go run .

examples/basic/database_sql/series.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ import (
1616
"github.com/ydb-platform/ydb-go-sdk/v3/table/types"
1717
)
1818

19-
func sliceToInterfaces[T any](v []T) []interface{} {
20-
ii := make([]interface{}, len(v))
21-
for i, vv := range v {
22-
ii[i] = vv
23-
}
24-
return ii
25-
}
26-
2719
func selectDefault(ctx context.Context, db *sql.DB) (err error) {
2820
// explain of query
2921
err = retry.Do(ctx, db, func(ctx context.Context, cc *sql.Conn) (err error) {
@@ -172,7 +164,7 @@ func selectScan(ctx context.Context, db *sql.DB) (err error) {
172164

173165
func fillTablesWithData(ctx context.Context, db *sql.DB) (err error) {
174166
series, seasonsData, episodesData := getData()
175-
args := []sql.NamedArg{
167+
args := []interface{}{
176168
sql.Named("seriesData", types.ListValue(series...)),
177169
sql.Named("seasonsData", types.ListValue(seasonsData...)),
178170
sql.Named("episodesData", types.ListValue(episodesData...)),
@@ -205,7 +197,7 @@ func fillTablesWithData(ctx context.Context, db *sql.DB) (err error) {
205197
title,
206198
air_date
207199
FROM AS_TABLE($episodesData);`,
208-
sliceToInterfaces(args)...,
200+
args...,
209201
); err != nil {
210202
return err
211203
}

0 commit comments

Comments
 (0)