Skip to content

Commit ef1dca0

Browse files
committed
Merge remote-tracking branch 'origin' into feat/filter-optimization
2 parents 904cbc3 + adc1d8a commit ef1dca0

File tree

61 files changed

+2558
-2434
lines changed

Some content is hidden

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

61 files changed

+2558
-2434
lines changed

.github/workflows/bump_templates.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,13 @@ jobs:
2222
- name: Bump templates
2323
run: tool/generate_bundles.sh
2424

25-
- name: Config Git User
26-
run: |
27-
git config user.name VGV Bot
28-
git config user.email [email protected]
29-
3025
- name: Create Pull Request
3126
uses: peter-evans/[email protected]
3227
with:
28+
token: ${{ secrets.VGV_BOT_PAT }}
3329
base: main
3430
branch: feat/bump-template-bundles
3531
commit-message: "feat: bump template bundles"
3632
title: "feat: bump template bundles"
3733
body: Please squash and merge me!
3834
labels: bot
39-
author: VGV Bot <[email protected]>
40-
assignees: vgvbot
41-
committer: VGV Bot <[email protected]>

.github/workflows/e2e.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ on:
2121
jobs:
2222
e2e:
2323
runs-on: ubuntu-latest
24-
2524
strategy:
2625
matrix:
2726
test:

.github/workflows/site.yaml

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: ⚙️ Setup Node
2828
uses: actions/setup-node@v5
2929
with:
30-
node-version: 18.x
30+
node-version: 20.x
3131
cache: npm
3232
cache-dependency-path: site/package-lock.json
3333

@@ -42,45 +42,3 @@ jobs:
4242

4343
- name: 👷 Build website
4444
run: npm run build
45-
46-
deploy:
47-
needs: build
48-
49-
runs-on: ubuntu-latest
50-
51-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
52-
53-
defaults:
54-
run:
55-
working-directory: site
56-
57-
steps:
58-
- name: 📚 Git Checkout
59-
uses: actions/checkout@v5
60-
61-
- name: ⚙️ Setup Node
62-
uses: actions/setup-node@v5
63-
with:
64-
node-version: 18.x
65-
cache: npm
66-
cache-dependency-path: site/package-lock.json
67-
68-
- name: 📦 Install Dependencies
69-
run: npm ci
70-
71-
- name: ✨ Check Format
72-
run: npm run format:check
73-
74-
- name: 🧹 Lint
75-
run: npm run lint
76-
77-
- name: 👷 Build website
78-
run: npm run build
79-
80-
- name: ☁️ Deploy to GitHub Pages
81-
uses: peaceiris/actions-gh-pages@v4
82-
with:
83-
github_token: ${{ secrets.GITHUB_TOKEN }}
84-
publish_dir: ./site/build
85-
user_name: github-actions[bot]
86-
user_email: 41898282+github-actions[bot]@users.noreply.github.com

.github/workflows/site_deploy.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: site_deploy
2+
3+
on:
4+
push:
5+
tags:
6+
- "v[0-9]+.[0-9]+.[0-9]+*"
7+
workflow_dispatch:
8+
9+
jobs:
10+
deploy:
11+
runs-on: ubuntu-latest
12+
13+
defaults:
14+
run:
15+
working-directory: site
16+
17+
steps:
18+
- name: 📚 Git Checkout
19+
uses: actions/checkout@v5
20+
21+
- name: ⚙️ Setup Node
22+
uses: actions/setup-node@v5
23+
with:
24+
node-version: 18.x
25+
cache: npm
26+
cache-dependency-path: site/package-lock.json
27+
28+
- name: 📦 Install Dependencies
29+
run: npm ci
30+
31+
- name: ✨ Check Format
32+
run: npm run format:check
33+
34+
- name: 🧹 Lint
35+
run: npm run lint
36+
37+
- name: 👷 Build website
38+
run: npm run build
39+
40+
- name: ☁️ Deploy to GitHub Pages
41+
uses: peaceiris/actions-gh-pages@v4
42+
with:
43+
github_token: ${{ secrets.GITHUB_TOKEN }}
44+
publish_dir: ./site/build
45+
user_name: github-actions[bot]
46+
user_email: 41898282+github-actions[bot]@users.noreply.github.com

.github/workflows/spdx_license_bot.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ jobs:
3737
id: make
3838
run: if [[ $(mason make spdx_license -q --licenses "[]" -o test --on-conflict overwrite --set-exit-if-changed) =~ "0 files changed" ]]; then echo "did_change=false"; else echo "did_change=true"; fi >> $GITHUB_ENV
3939

40-
- name: 🔑 Config Git User
41-
if: ${{ env.did_change == 'true' }}
42-
run: |
43-
git config user.name VGV Bot
44-
git config user.email [email protected]
45-
4640
- name: 🧱 Mason Make (lib/pub_license/spdx_license)
4741
if: ${{ env.did_change == 'true' }}
4842
run: |
@@ -55,12 +49,10 @@ jobs:
5549
if: ${{ env.did_change == 'true' }}
5650
uses: peter-evans/[email protected]
5751
with:
52+
token: ${{ secrets.VGV_BOT_PAT }}
5853
base: main
5954
branch: chore/update-spdx-license
6055
commit-message: "chore: update SPDX licenses"
6156
title: "chore: update SPDX licenses"
6257
body: Please squash and merge me!
6358
labels: bot
64-
author: VGV Bot <[email protected]>
65-
assignees: vgvbot
66-
committer: VGV Bot <[email protected]>

bricks/test_optimizer/hooks/lib/pre_gen.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// No need for documentation in brick hooks
2-
// ignore_for_file: public_member_api_docs
3-
41
import 'dart:io';
52

63
import 'package:hooks/dart_identifier_generator.dart';

bricks/test_optimizer/hooks/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ dependencies:
1313
dev_dependencies:
1414
mocktail: ^1.0.0
1515
test: ^1.25.0
16-
very_good_analysis: ^9.0.0
16+
very_good_analysis: ^10.0.0

e2e/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ dev_dependencies:
1313
pub_updater: ^0.5.0
1414
test: ^1.25.0
1515
universal_io: ^2.0.4
16-
very_good_analysis: ^9.0.0
16+
very_good_analysis: ^10.0.0
1717
very_good_cli:
1818
path: ../

e2e/test/commands/create/dart_cli/dart_cli_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void main() {
6464
['coverage/lcov.info', '-o', 'coverage'],
6565
workingDirectory: workingDirectory,
6666
);
67-
expect(testCoverageResult.stdout, contains('lines......: 100.0%'));
67+
expect(testCoverageResult.stdout, matches(RegExp('lines(.+) 100.0%')));
6868
}),
6969
);
7070
}

e2e/test/commands/create/dart_package/dart_pkg_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void main() {
6565
['coverage/lcov.info', '-o', 'coverage'],
6666
workingDirectory: workingDirectory,
6767
);
68-
expect(testCoverageResult.stdout, contains('lines......: 100.0%'));
68+
expect(testCoverageResult.stdout, matches(RegExp('lines(.+) 100.0%')));
6969
}),
7070
);
7171
}

0 commit comments

Comments
 (0)