Skip to content

Commit ae832d5

Browse files
committed
feat(refactor): direct build props
1 parent 3bc7897 commit ae832d5

File tree

12 files changed

+469
-7900
lines changed

12 files changed

+469
-7900
lines changed

.github/workflows/reuseable-ci-checks.yml

Lines changed: 2 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
#TELBLAZOR_PACKAGE_SOURCE: "https://nuget.pkg.github.com/TechnologyEnhancedLearning/index.json"
3535

3636
# Build Set Up
37-
# qqqq making below true for now to match local
37+
# May need coverlet.collector xplat if using the packaged version to test
3838
USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE: true
3939
DISABLE_PACKAGE_GENERATION: true
4040
E2E_TRACING_ENABLED: false
@@ -123,7 +123,6 @@ jobs:
123123
/p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
124124
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
125125
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED
126-
127126
128127
reuseable-ci-checks-branch-name-check:
129128
name: Check branch names
@@ -202,12 +201,10 @@ jobs:
202201
# paths["./TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Production.json"]='${{ secrets.WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION }}'
203202
# paths["./TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/appsettings.Production.json"]='${{ secrets.WASMSERVERHOST_APPSETTINGS_PRODUCTION }}'
204203
205-
206204
for path in "${!paths[@]}"; do
207205
mkdir -p "$(dirname "$path")"
208206
printf '%s' "${paths[$path]}" > "$path"
209207
done
210-
211208
212209
- name: Set up Node.js so we have gulp for retrieving TEL Frontend Css
213210
uses: actions/setup-node@v4
@@ -235,20 +232,6 @@ jobs:
235232
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
236233
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED \
237234
/p:HeadlessTesting=$HEADLESS_TESTING
238-
239-
# /p:CollectCoverage=true \
240-
# /p:CoverletOutputFormat=cobertura \
241-
# /p:Threshold=50 \
242-
# /p:ThresholdType=line \
243-
# /p:ThresholdStat=total \
244-
# /p:ThresholdBranch=50 \
245-
# /p:ThresholdMethod=50 \
246-
# /p:Include="[TELBlazor.Components]*" \
247-
# /p:ExcludeByAttribute=ExcludeFromCodeCoverage \
248-
# /p:IncludeTestAssembly=true \
249-
# /p:CoverletOutput=/home/runner/work/TELBlazor/TELBlazor/AllTestResults/ \
250-
# /p:MergeWith=/home/runner/work/TELBlazor/TELBlazor/AllTestResults/coverage.json
251-
# /p:ExcludeByFile="**/Program.cs,**/Components/TestComponents/*.*" \
252235
253236
- name: Build solution without generating new package
254237
env:
@@ -264,30 +247,9 @@ jobs:
264247
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED \
265248
/p:HeadlessTesting=$HEADLESS_TESTING
266249
267-
# /p:CollectCoverage=true \
268-
# /p:CoverletOutputFormat=cobertura \
269-
# /p:Threshold=50 \
270-
# /p:ThresholdType=line \
271-
# /p:ThresholdStat=total \
272-
# /p:ThresholdBranch=50 \
273-
# /p:ThresholdMethod=50 \
274-
# /p:Include="[TELBlazor.Components]*" \
275-
# /p:ExcludeByAttribute=ExcludeFromCodeCoverage \
276-
# /p:IncludeTestAssembly=true \
277-
# /p:CoverletOutput=/home/runner/work/TELBlazor/TELBlazor/AllTestResults/ \
278-
# /p:MergeWith=/home/runner/work/TELBlazor/TELBlazor/AllTestResults/coverage.json
279-
280-
# /p:ExcludeByFile="**/Program.cs,**/Components/TestComponents/*.*" \
281250
282251
- name: Ensure browsers are installed
283252
run: pwsh TELBlazor.Components.ShowCase.E2ETests/bin/Debug/net8.0/playwright.ps1 install --with-deps
284-
285-
- name: Debug DLL/PDB outputs
286-
run: |
287-
find . -name "TELBlazor.Components.UnitTests.dll"
288-
find . -name "TELBlazor.Components.UnitTests.pdb"
289-
290-
291253

292254

293255
- name: Run tests with coverage threshold check
@@ -310,22 +272,8 @@ jobs:
310272
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED \
311273
/p:HeadlessTesting=$HEADLESS_TESTING
312274
313-
# /p:CollectCoverage=true \
314-
# /p:CoverletOutputFormat=cobertura \
315-
# /p:Threshold=50 \
316-
# /p:ThresholdType=line \
317-
# /p:ThresholdStat=total \
318-
# /p:ThresholdBranch=50 \
319-
# /p:ThresholdMethod=50 \
320-
# /p:Include="[TELBlazor.Components]*" \
321-
# /p:ExcludeByAttribute=ExcludeFromCodeCoverage \
322-
# /p:IncludeTestAssembly=true \
323-
# /p:CoverletOutput=/home/runner/work/TELBlazor/TELBlazor/AllTestResults/ \
324-
# /p:MergeWith=/home/runner/work/TELBlazor/TELBlazor/AllTestResults/coverage.json
325275
continue-on-error: true
326276

327-
# /p:ExcludeByFile="**/Program.cs,**/Components/TestComponents/*.*" \
328-
329277
- name: Generate Coverage Report
330278
run: |
331279
dotnet reportgenerator \
@@ -340,11 +288,7 @@ jobs:
340288
with:
341289
name: coverage-report
342290
path: CoverageReport
343-
344-
# - name: Debug PACKAGES_TOKEN value (Optional) qqqq
345-
# run: |
346-
# echo "PACKAGES_TOKEN is set."
347-
# echo "PACKAGES_TOKEN=$PACKAGES_TOKEN" # This should print nothing, it's a secret!
291+
348292

349293
- name: Get artifact location
350294
env:
@@ -362,13 +306,6 @@ jobs:
362306
echo "Artifact URL: $ARTIFACT_URL"
363307
echo "artifact_url=$ARTIFACT_URL" >> $GITHUB_ENV
364308
365-
366-
# # Extract the download URL from the artifact list (first artifact in the list)
367-
# #ARTIFACT_URL=$(echo "$ARTIFACT_LIST" | jq -r '.artifacts[0].archive_download_url')
368-
# ARTIFACT_URL=$(echo "$ARTIFACT_LIST" | jq -r '.artifacts[0].url')
369-
# # Echo the artifact URL to confirm
370-
# echo "Artifact URL: $ARTIFACT_URL"
371-
# echo "artifact_url=$ARTIFACT_URL" >> $GITHUB_ENV
372309
373310
- name: Trigger workflow in TELBlazor-CodeReport repo
374311
env:
@@ -396,12 +333,6 @@ jobs:
396333
fi
397334
398335
399-
# - name: Fail if code coverage report didnt meet threshold qqqq todo better to parse the report than rerun tests
400-
# run: dotnet test
401-
402-
403-
# - reuseable-ci-checks-unit-tests
404-
# - reuseable-ci-checks-e2e-tests
405336
reuseable-ci-checks-check-for-failed-jobs:
406337
name: Check for failures
407338
if: ${{ inputs.runall }}
@@ -411,8 +342,6 @@ jobs:
411342
- reuseable-ci-checks-commitlint
412343
- reuseable-ci-e2e-unit-tests
413344

414-
# echo "Unit Tests: ${{ needs.reuseable-ci-checks-unit-tests.outputs.status }}"
415-
# echo "E2E Tests: ${{ needs.reuseable-ci-checks-e2e-tests.outputs.status }}"
416345
runs-on: ubuntu-latest
417346
steps:
418347
- name: Check Job Results
@@ -421,9 +350,6 @@ jobs:
421350
echo "Branch Name Check: ${{ needs.reuseable-ci-checks-branch-name-check.outputs.status }}"
422351
echo "Commit Lint Check: ${{ needs.reuseable-ci-checks-commitlint.outputs.status }}"
423352
echo "Tests: ${{ needs.reuseable-ci-e2e-unit-tests.outputs.status }}"
424-
425-
# "${{ needs.reuseable-ci-checks-unit-tests.outputs.status }}" != "success" || \
426-
# "${{ needs.reuseable-ci-checks-e2e-tests.outputs.status }}" != "success" || \
427353
428354
# Check if any job is not success (failure, cancelled, skipped)
429355
if [[ "${{ needs.reuseable-ci-checks-solution-build.outputs.status }}" != "success" || \

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,4 @@ CHANGELOG.md
190190
/TELBlazor.Components.UnitTests/coverage.json
191191
/TELBlazor.Components.UnitTests/coverage.cobertura.xml
192192
/CoverageReport
193+
/TELBlazor.Components/wwwroot/css/nhsuk.css

0 commit comments

Comments
 (0)