Skip to content

Commit fdbc48e

Browse files
ysmoradiysmoradi
authored
feat(infra): Refactor aspire related stuffs phase 2 #11481 (#11482)
1 parent 8ced9cb commit fdbc48e

File tree

25 files changed

+150
-98
lines changed

25 files changed

+150
-98
lines changed

‎.github/workflows/admin-sample.cd.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
AdsPushVapid.PublicKey: ${{ secrets.ADMINPANEL_PUBLIC_VAPIDKEY }}
5757
ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }}
5858

59-
- uses: actions/setup-node@v4
59+
- uses: actions/setup-node@v6
6060
with:
6161
node-version: 23
6262

@@ -113,7 +113,7 @@ jobs:
113113
AdsPushVapid.PublicKey: ${{ secrets.ADMINPANEL_PUBLIC_VAPIDKEY }}
114114
ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }}
115115

116-
- uses: actions/setup-node@v4
116+
- uses: actions/setup-node@v6
117117
with:
118118
node-version: 23
119119

@@ -183,7 +183,7 @@ jobs:
183183
with:
184184
global-json-file: src\global.json
185185

186-
- uses: actions/setup-node@v4
186+
- uses: actions/setup-node@v6
187187
with:
188188
node-version: 23
189189

@@ -248,7 +248,7 @@ jobs:
248248
dotnet new install Bit.Boilerplate.0.0.0.nupkg
249249
cd ../../../ && dotnet new bit-bp --name AdminPanel --database PostgreSQL --module Admin --sentry --apiServerUrl ${{ env.SERVER_ADDRESS }} --webAppUrl ${{ env.SERVER_ADDRESS }} --filesStorage AzureBlobStorage --notification --captcha reCaptcha --signalR --ads
250250
251-
- uses: actions/setup-node@v4
251+
- uses: actions/setup-node@v6
252252
with:
253253
node-version: 23
254254

@@ -320,7 +320,7 @@ jobs:
320320
with:
321321
xcode-version: '16.4'
322322

323-
- uses: actions/setup-node@v4
323+
- uses: actions/setup-node@v6
324324
with:
325325
node-version: 23
326326

‎.github/workflows/bit.ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
dotnet-version: |
3838
8.0.x
3939
40-
- uses: actions/setup-node@v4
40+
- uses: actions/setup-node@v6
4141
with:
4242
node-version: 23
4343

@@ -81,7 +81,7 @@ jobs:
8181
dotnet-version: |
8282
8.0.x
8383
84-
- uses: actions/setup-node@v4
84+
- uses: actions/setup-node@v6
8585
with:
8686
node-version: 23
8787

‎.github/workflows/bit.full.ci.yml‎

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
workflow_dispatch:
55

66
env:
7-
ConnectionStrings__sqldb: 'Data Source=localhost; Initial Catalog=BoilerplateTestDb;Application Name=Boilerplate;TrustServerCertificate=True;User Id=sa;Password=P@ssw0rdP@ssw0rd;'
87
DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
98

109
jobs:
@@ -35,7 +34,7 @@ jobs:
3534
dotnet-version: |
3635
8.0.x
3736
38-
- uses: actions/setup-node@v4
37+
- uses: actions/setup-node@v6
3938
with:
4039
node-version: 23
4140

@@ -51,40 +50,32 @@ jobs:
5150
dotnet workload install maui-tizen maui-android wasm-tools wasm-tools-net9 wasm-tools-net8
5251
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
5352
54-
- name: Run tests usign Sqlite
55-
id: run-test-sqlite
53+
- name: Run tests using PostgreSQL
54+
id: run-test-postgresql
5655
run: |
57-
dotnet new bit-bp --name SimpleTest --database Sqlite
58-
cd SimpleTest/src/Server/SimpleTest.Server.Api/
56+
dotnet new bit-bp --name TestPostgreSQL --database PostgreSQL --module Sales --signalR --aspire
57+
cd TestPostgreSQL/src/Server/TestPostgreSQL.Server.Api/
5958
dotnet build
6059
dotnet tool restore
6160
dotnet ef migrations add Initial --verbose
62-
dotnet ef database update
6361
cd ../../Tests
6462
dotnet build
6563
pwsh bin/Debug/net10.0/playwright.ps1 install --with-deps
6664
dotnet test
6765
6866
- name: Upload Tests Artifact
6967
uses: actions/[email protected]
70-
if: ${{ !env.ACT && failure() && steps.run-test-sqlite.conclusion == 'failure' }}
68+
if: ${{ !env.ACT && failure() && steps.run-test-postgresql.conclusion == 'failure' }}
7169
with:
7270
name: tests-artifact
73-
path: ./SimpleTest/src/Tests/TestResults
71+
path: ./TestPostgreSQL/src/Tests/TestResults
7472
retention-days: 14
7573

76-
- name: Install sql server
77-
uses: potatoqualitee/[email protected]
78-
with:
79-
install: sqlengine
80-
sa-password: P@ssw0rdP@ssw0rd
81-
show-log: true
82-
83-
- name: Run tests usign SQL Server
84-
id: run-test-sqlserver
74+
- name: Run tests using Sqlite
75+
id: run-test-sqlite
8576
run: |
86-
dotnet new bit-bp --name TestSqlServer --database SqlServer --module Sales --signalR
87-
cd TestSqlServer/src/Server/TestSqlServer.Server.Api/
77+
dotnet new bit-bp --name SimpleTest --database Sqlite --aspire false
78+
cd SimpleTest/src/Server/SimpleTest.Server.Api/
8879
dotnet build
8980
dotnet tool restore
9081
dotnet ef migrations add Initial --verbose
@@ -96,24 +87,24 @@ jobs:
9687
9788
- name: Upload Tests Artifact
9889
uses: actions/[email protected]
99-
if: ${{ !env.ACT && failure() && steps.run-test-sqlserver.conclusion == 'failure' }}
90+
if: ${{ !env.ACT && failure() && steps.run-test-sqlite.conclusion == 'failure' }}
10091
with:
10192
name: tests-artifact
102-
path: ./TestSqlServer/src/Tests/TestResults
93+
path: ./SimpleTest/src/Tests/TestResults
10394
retention-days: 14
10495

10596
- name: Cleanup test projects to free disk space
10697
run: |
10798
rm -rf SimpleTest
108-
rm -rf TestSqlServer
99+
rm -rf TestPostgreSQL
109100
110-
- name: Build PostgreSQL and Other database options
101+
- name: Build SQLServer and Other database options
111102
run: |
112-
dotnet new bit-bp --name TestPostgreSQL --database PostgreSQL --module Sales --signalR
113-
cd TestPostgreSQL/src/Server/TestPostgreSQL.Server.Web/
103+
dotnet new bit-bp --name SQLServer --database SQLServer --module Sales --signalR
104+
cd SQLServer/src/Server/SQLServer.Server.Web/
114105
dotnet build
115106
cd ../../../../
116-
rm -r "TestPostgreSQL"
107+
rm -r "SQLServer"
117108
dotnet new bit-bp --name TestOther --database Other --sample --sentry
118109
cd TestOther/src/Server/TestOther.Server.Web/
119110
dotnet build

‎.github/workflows/blazorui.demo.cd.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
env:
3636
ApiServerAddress: ${{ env.SERVER_ADDRESS }}
3737

38-
- uses: actions/setup-node@v4
38+
- uses: actions/setup-node@v6
3939
with:
4040
node-version: 23
4141

@@ -102,7 +102,7 @@ jobs:
102102
with:
103103
global-json-file: src\global.json
104104

105-
- uses: actions/setup-node@v4
105+
- uses: actions/setup-node@v6
106106
with:
107107
node-version: 23
108108

@@ -144,7 +144,7 @@ jobs:
144144
with:
145145
global-json-file: src/global.json
146146

147-
- uses: actions/setup-node@v4
147+
- uses: actions/setup-node@v6
148148
with:
149149
node-version: 23
150150

@@ -198,7 +198,7 @@ jobs:
198198
with:
199199
xcode-version: '16.4'
200200

201-
- uses: actions/setup-node@v4
201+
- uses: actions/setup-node@v6
202202
with:
203203
node-version: 23
204204

‎.github/workflows/nuget.org.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
global-json-file: src/global.json
3030

31-
- uses: actions/setup-node@v4
31+
- uses: actions/setup-node@v6
3232
with:
3333
node-version: 23
3434

‎.github/workflows/prerelease.nuget.org.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
global-json-file: src/global.json
2121

22-
- uses: actions/setup-node@v4
22+
- uses: actions/setup-node@v6
2323
with:
2424
node-version: 23
2525

‎.github/workflows/sales-module-demo.cd.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
global-json-file: src/global.json
3333

34-
- uses: actions/setup-node@v4
34+
- uses: actions/setup-node@v6
3535
with:
3636
node-version: 23
3737

@@ -127,7 +127,7 @@ jobs:
127127
with:
128128
global-json-file: src\global.json
129129

130-
- uses: actions/setup-node@v4
130+
- uses: actions/setup-node@v6
131131
with:
132132
node-version: 23
133133

‎.github/workflows/todo-sample.cd.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
global-json-file: src/global.json
3333

34-
- uses: actions/setup-node@v4
34+
- uses: actions/setup-node@v6
3535
with:
3636
node-version: 23
3737

@@ -144,7 +144,7 @@ jobs:
144144
ServerAddress: ${{ env.SERVER_ADDRESS }}
145145
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
146146

147-
- uses: actions/setup-node@v4
147+
- uses: actions/setup-node@v6
148148
with:
149149
node-version: 23
150150

@@ -196,7 +196,7 @@ jobs:
196196
ServerAddress: ${{ env.SERVER_ADDRESS }}
197197
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
198198

199-
- uses: actions/setup-node@v4
199+
- uses: actions/setup-node@v6
200200
with:
201201
node-version: 23
202202

@@ -252,7 +252,7 @@ jobs:
252252
ServerAddress: ${{ env.SERVER_ADDRESS }}
253253
GoogleRecaptchaSiteKey: ${{ secrets.GOOGLE_RECAPTCHA_SITE_KEY }}
254254

255-
- uses: actions/setup-node@v4
255+
- uses: actions/setup-node@v6
256256
with:
257257
node-version: 23
258258

@@ -289,7 +289,7 @@ jobs:
289289
with:
290290
global-json-file: src/global.json
291291

292-
- uses: actions/setup-node@v4
292+
- uses: actions/setup-node@v6
293293
with:
294294
node-version: 23
295295

@@ -347,7 +347,7 @@ jobs:
347347
with:
348348
global-json-file: src/global.json
349349

350-
- uses: actions/setup-node@v4
350+
- uses: actions/setup-node@v6
351351
with:
352352
node-version: 23
353353

@@ -442,7 +442,7 @@ jobs:
442442
with:
443443
global-json-file: src/global.json
444444

445-
- uses: actions/setup-node@v4
445+
- uses: actions/setup-node@v6
446446
with:
447447
node-version: 23
448448

‎src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd-template.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
global-json-file: global.json
3131

32-
- uses: actions/setup-node@v4
32+
- uses: actions/setup-node@v6
3333
with:
3434
node-version: 23
3535

@@ -112,7 +112,7 @@ jobs:
112112
with:
113113
global-json-file: global.json
114114

115-
- uses: actions/setup-node@v4
115+
- uses: actions/setup-node@v6
116116
with:
117117
node-version: 23
118118

@@ -159,7 +159,7 @@ jobs:
159159
with:
160160
global-json-file: global.json
161161

162-
- uses: actions/setup-node@v4
162+
- uses: actions/setup-node@v6
163163
with:
164164
node-version: 23
165165

@@ -221,7 +221,7 @@ jobs:
221221
with:
222222
xcode-version: '16.4'
223223

224-
- uses: actions/setup-node@v4
224+
- uses: actions/setup-node@v6
225225
with:
226226
node-version: 23
227227

‎src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
global-json-file: global.json
2727

28-
- uses: actions/setup-node@v4
28+
- uses: actions/setup-node@v6
2929
with:
3030
node-version: 23
3131

0 commit comments

Comments
 (0)