Skip to content

Commit 21a1953

Browse files
author
Gabor
committed
Merge branch 'main' of github.com:zino-hofmann/graphql-flutter; branch 'main' of github.com:szantogab/graphql-flutter
2 parents c455e36 + 32040ee commit 21a1953

Some content is hidden

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

54 files changed

+1080
-414
lines changed

.github/workflows/build.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
8+
9+
jobs:
10+
build:
11+
strategy:
12+
matrix:
13+
channel:
14+
- stable
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
- uses: subosito/flutter-action@v2
19+
with:
20+
channel: ${{matrix.channel}}
21+
- name: Install dependencies
22+
run: make dep
23+
- name: Code formatting check
24+
run: make ci_fmt_client
25+
- name: Code formatting check (flutter)
26+
run: make ci_fmt_flutter

.github/workflows/graphql_codcoverage.yml renamed to .github/workflows/codcoverage.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
name: graphql Code coverage
1+
name: Codecoverage
22

3-
on: [ push, pull_request ]
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
48

59
jobs:
610
build:
@@ -14,9 +18,9 @@ jobs:
1418
- name: Run tests with coverage
1519
run: |
1620
make dep
17-
make ci_coverage_client
18-
- name: Upload coverage file
19-
run: |
2021
curl -Os https://uploader.codecov.io/latest/linux/codecov
2122
chmod +x codecov
23+
make ci_coverage_client
24+
./codecov
25+
make ci_coverage_flutter
2226
./codecov

.github/workflows/graphql_build.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/graphql_flutter_build.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/graphql_flutter_codcoverage.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/graphql_tests.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/packages_build.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/packages_tests.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/workflows/graphql_release.yml renamed to .github/workflows/release_dart.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: graphql Release Package
1+
name: Release (dart)
22

33
on:
44
release:
@@ -8,8 +8,8 @@ on:
88
push:
99
workflow_run:
1010
workflows:
11-
- "graphql Test case"
12-
- "graphql Dart Code sanity check"
11+
- "Test"
12+
- "Build"
1313
branches: [ main ]
1414
types:
1515
- completed

.github/workflows/graphql_flutter_release.yml renamed to .github/workflows/release_flutter.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: graphql-flutter Release Package
1+
name: Release (flutter)
22

33
on:
44
release:
@@ -8,9 +8,8 @@ on:
88
push:
99
workflow_run:
1010
workflows:
11-
- "graphql-flutter Dart Code sanity check"
12-
- "graphql-flutter Tests case"
13-
- "graphql Release Package"
11+
- "Build"
12+
- "Test"
1413
branches: [ main ]
1514
types:
1615
- completed

.github/workflows/packages_release.yml renamed to .github/workflows/release_packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: publish packages to pub.dev
1+
name: Release (packages)
22

33
on:
44
release:
55
types: [created]
66
tags:
7-
- v-*
7+
- v-packages-*
88
jobs:
99
publishing_client:
1010
runs-on: ubuntu-latest
Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
name: graphql_flutter tests case
1+
name: Test
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: [main]
48

59
jobs:
610
build:
@@ -10,8 +14,9 @@ jobs:
1014
- uses: subosito/flutter-action@v1
1115
with:
1216
channel: 'stable'
13-
flutter-version: '2.10.5'
1417
- name: Install dependencies
1518
run: make dep
16-
- name: Tests
19+
- name: Tests (dart)
20+
run: make ci_check_client
21+
- name: Tests (flutter)
1722
run: make ci_check_flutter

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ios/Flutter/Generated.xcconfig
1515
ios/Runner/GeneratedPluginRegistrant.*
1616
.flutter-plugins
1717
pubspec.lock
18+
pubspec_overrides.yaml
1819

1920
# Coverage
2021
coverage.json

.releaserc.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

Makefile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
CC=dart pub global run melos
2-
CC_TEST=spec
2+
#CC_TEST=spec
33
CC_CHANGELOG=dart pub global run changelog_cmd
44

55
default: analyze check
66

77
dep:
88
dart pub global activate melos;
9-
dart pub global activate spec_cli;
10-
dart pub global activate changelog_cmd;
9+
# dart pub global activate changelog_cmd;
1110
$(CC) bootstrap
1211

13-
check:
14-
$(CC_TEST)
12+
check: ci_check_client ci_check_flutter
1513

1614
fmt:
1715
$(CC) run format --no-select
1816

1917
analyze: fmt
20-
$(CC) run analyze --no-select
18+
$(CC) run client_analyze --no-select
19+
$(CC) run flutter_analyze --no-select
20+
21+
client: ci_check_client ci_fmt_client
22+
23+
flutter: ci_check_flutter ci_fmt_flutter
2124

2225
ci_check_flutter:
2326
$(CC) run flutter_test --no-select
@@ -52,4 +55,4 @@ changelog: changelog_client changelog_flutter
5255
ci: dep check_client check_flutter
5356

5457
clean:
55-
$(CC) clean
58+
$(CC) clean

0 commit comments

Comments
 (0)