Skip to content

Commit c34df16

Browse files
Phil-NHSPhil-NHS
committed
chore(merge): from master
1 parent 20c59db commit c34df16

File tree

9 files changed

+69
-22
lines changed

9 files changed

+69
-22
lines changed

‎.github/workflows/workflow-readme.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,40 @@
1010
# Scripts
1111

1212
## Dev
13+
14+
### Overview
1315
Dev Check Test Package TELBlazor.Components Trigger TELBlazor-DevShowCase Deployment
1416

1517
- Run checks from reeuseable ci checks workflow
1618
- versions repo and package
1719
- Artifact and workflow trigger for GH-Page deployment TELBlazor-DevShowCase
1820

21+
### Detail
22+
- Uses Nugetkey token which is an organisational token
23+
- the project at the solution level has a CICDPackageLocation folder the route to which is defined by ```LOCAL_PACKAGES_PATH : ${{ github.workspace }}/CICDPackageLocation```
24+
- This is the path we build the package to before giving it to the repo git package area
25+
- ```dev-call-reusable-ci-checks-workflow``` just build checks and tests
26+
- ```generate-dev-semantic-version```
27+
- ``` outputs:
28+
dev-package-version: ${{ steps.set_dev_semantic_version.outputs.dev-semantic-version }}```
29+
- the id is used to reference what step is setting the value of dev-package-version
30+
- it is dev package version because we version the dev package versions seperately
31+
- npm installs sematic-release
32+
- we run npx sematic-release for the version
33+
- there can be no version if no change so then we just use the repo tag
34+
- we add the date too
35+
- the package version for dev does not need to be the right order it just needs to have one for easy development its the release version that matters
36+
- next set_dev_semantic_version just adds a timestamp to the string
37+
- build-telblazor-dev-package-and-publish
38+
- we use nuget.config.cicd as the nuget template which takes our environmental values via text replace
39+
- we clean lock files because there is about to be a version change
40+
- we build
41+
- build creates a partial which has the version in it which is useful for the ShowCase
42+
- The project has a flag that allows building to publish the Package
43+
- it uses the nuget output path to the CICD folder at solution level
44+
- We publish the Package
45+
- trigger-gh-pages-telblazor-devshowcase-workflow
46+
- makes the showcase using the package
1947

2048
## Pull_Request
2149
- just runs on all pull requests the Reuseable Ci Checks
@@ -28,10 +56,13 @@ they stay in the pull request ui. they are also only targetted on master
2856

2957

3058
## Release
59+
### Overview
3160
- if there is a version change it updates
3261
- repo tag
3362
- packages with new package and version
3463
- TELBlazor-ShowCase site
64+
### Detail
65+
3566

3667
## dependabot
3768
- npm and node
@@ -51,3 +82,5 @@ The individual steps also automatically pass so can see if any error at the end
5182
- doesnt run easily with nektos act due to git ref checks and calling other workflows
5283
- for tests use the run-tests-and-report-with-env-values.ps1 file
5384

85+
## Versioning
86+

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@
2929
# [1.9.0-feat-button-for-cicd-testing.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0...v1.9.0-feat-button-for-cicd-testing.1) (2025-06-25)
3030

3131

32+
### Bug Fixes
33+
34+
* **search:** Improved debounce ([fbc7b0b](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/fbc7b0be762982b8701c24e696133e0dd2facd97))
35+
36+
37+
### Features
38+
39+
* **searchexperiment:** in theory ([fee2b91](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/fee2b9124b859f9a548e3fa257d53294ce83dc08))
40+
* **showcase:** added component readme displayer ([a058fe6](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/a058fe6f034b5097fb72c9f72a8b98c57ed2b607))
41+
42+
# [1.9.0-feat-button-for-cicd-testing.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0...v1.9.0-feat-button-for-cicd-testing.1) (2025-06-25)
43+
44+
3245
### Features
3346

3447
* **searchexperiment:** in theory ([fee2b91](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/fee2b9124b859f9a548e3fa257d53294ce83dc08))

‎TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/packages.lock.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
},
4141
"Microsoft.NET.ILLink.Tasks": {
4242
"type": "Direct",
43-
"requested": "[8.0.17, )",
44-
"resolved": "8.0.17",
45-
"contentHash": "x5/y4l8AtshpBOrCZdlE4txw8K3e3s9meBFeZeR3l8hbbku2V7kK6ojhXvrbjg1rk3G+JqL1BI26gtgc1ZrdUw=="
43+
"requested": "[8.0.18, )",
44+
"resolved": "8.0.18",
45+
"contentHash": "OiXqr2YIBEV9dsAWEtasK470ALyJ0VxJ9k4MotOxlWV6HeEgrJKYMW4HHj1OCCXvqE0/A25wEKPkpfiBARgDZA=="
4646
},
4747
"Microsoft.NET.Sdk.WebAssembly.Pack": {
4848
"type": "Direct",
49-
"requested": "[8.0.17, )",
50-
"resolved": "8.0.17",
51-
"contentHash": "wufm5kIsP5PlG54bahrhJDPbN114ru7mIYOdyVQS4sCr3811SLqcn1X6rg3mxZgGxRbyfMcMBXcg5P2HV/MRYQ=="
49+
"requested": "[8.0.18, )",
50+
"resolved": "8.0.18",
51+
"contentHash": "SoVkRwFwnaX39J1uaI72PTilSJ6OoonIG+2VMpazEaAA9t+aJt2Caf49q76SYv3x9iU8hu1axlMWSkR9rt8nIg=="
5252
},
5353
"Serilog": {
5454
"type": "Direct",
@@ -321,7 +321,7 @@
321321
"Markdig": "[0.41.3, )",
322322
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
323323
"Serilog": "[4.2.0, )",
324-
"TELBlazor.Components": "[1.9.2-local, )"
324+
"TELBlazor.Components": "[1.9.3-local, )"
325325
}
326326
},
327327
"Markdig": {

‎TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/packages.lock.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
"Serilog.Settings.Configuration": "[8.0.0, )",
349349
"Serilog.Sinks.BrowserConsole": "[8.0.0, )",
350350
"Serilog.Sinks.Http": "[8.0.0, )",
351-
"TELBlazor.Components": "[1.9.2-local, )",
351+
"TELBlazor.Components": "[1.9.3-local, )",
352352
"TELBlazor.Components.ShowCase.Shared": "[1.0.0, )"
353353
}
354354
},
@@ -359,7 +359,7 @@
359359
"Markdig": "[0.41.3, )",
360360
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
361361
"Serilog": "[4.2.0, )",
362-
"TELBlazor.Components": "[1.9.2-local, )"
362+
"TELBlazor.Components": "[1.9.3-local, )"
363363
}
364364
},
365365
"Markdig": {

‎TELBlazor.Components.ShowCase.E2ETests/packages.lock.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@
16011601
"Serilog.Settings.Configuration": "[8.0.0, )",
16021602
"Serilog.Sinks.BrowserConsole": "[8.0.0, )",
16031603
"Serilog.Sinks.Http": "[8.0.0, )",
1604-
"TELBlazor.Components": "[1.9.2-local, )",
1604+
"TELBlazor.Components": "[1.9.3-local, )",
16051605
"TELBlazor.Components.ShowCase.Shared": "[1.0.0, )"
16061606
}
16071607
},
@@ -1612,7 +1612,7 @@
16121612
"Markdig": "[0.41.3, )",
16131613
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
16141614
"Serilog": "[4.2.0, )",
1615-
"TELBlazor.Components": "[1.9.2-local, )"
1615+
"TELBlazor.Components": "[1.9.3-local, )"
16161616
}
16171617
},
16181618
"Blazored.LocalStorage": {

‎TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@
7676
},
7777
"Microsoft.NET.ILLink.Tasks": {
7878
"type": "Direct",
79-
"requested": "[8.0.17, )",
80-
"resolved": "8.0.17",
81-
"contentHash": "x5/y4l8AtshpBOrCZdlE4txw8K3e3s9meBFeZeR3l8hbbku2V7kK6ojhXvrbjg1rk3G+JqL1BI26gtgc1ZrdUw=="
79+
"requested": "[8.0.18, )",
80+
"resolved": "8.0.18",
81+
"contentHash": "OiXqr2YIBEV9dsAWEtasK470ALyJ0VxJ9k4MotOxlWV6HeEgrJKYMW4HHj1OCCXvqE0/A25wEKPkpfiBARgDZA=="
8282
},
8383
"Microsoft.NET.Sdk.WebAssembly.Pack": {
8484
"type": "Direct",
85-
"requested": "[8.0.17, )",
86-
"resolved": "8.0.17",
87-
"contentHash": "wufm5kIsP5PlG54bahrhJDPbN114ru7mIYOdyVQS4sCr3811SLqcn1X6rg3mxZgGxRbyfMcMBXcg5P2HV/MRYQ=="
85+
"requested": "[8.0.18, )",
86+
"resolved": "8.0.18",
87+
"contentHash": "SoVkRwFwnaX39J1uaI72PTilSJ6OoonIG+2VMpazEaAA9t+aJt2Caf49q76SYv3x9iU8hu1axlMWSkR9rt8nIg=="
8888
},
8989
"Serilog": {
9090
"type": "Direct",
@@ -464,7 +464,7 @@
464464
"Markdig": "[0.41.3, )",
465465
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
466466
"Serilog": "[4.2.0, )",
467-
"TELBlazor.Components": "[1.9.2-local, )"
467+
"TELBlazor.Components": "[1.9.3-local, )"
468468
}
469469
},
470470
"Markdig": {

‎TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace TELBlazor.Components.OptionalImplementations.Test.TestComponents.Searc
1515
//curl -X 'GET' \
1616
// 'https://lh-openapi.dev.local/Search/GetAutoSuggestionResult/blood' \
1717
// -H 'accept: */*' \
18-
// -H 'Authorization: Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IkVCREI0RUNGNzZCRDk4Rjc2MzU1RkQxQzg3OTAzRTdGIiwidHlwIjoiYXQrand0In0.eyJuYmYiOjE3NTAyNDY1NzEsImV4cCI6MTc1MDI1MDE3MSwiaXNzIjoiaHR0cHM6Ly9saC1hdXRoLmRldi5sb2NhbCIsImF1ZCI6ImxlYXJuaW5naHViYXBpIiwiY2xpZW50X2lkIjoibGVhcm5pbmdodWJvcGVuYXBpIiwic3ViIjoiNTc1NDEiLCJhdXRoX3RpbWUiOjE3NTAyNDY0NjAsImlkcCI6ImxvY2FsIiwiZW1haWwiOiJwaGlsaXAudGF0ZUBuaHMubmV0IiwiZ2l2ZW5fbmFtZSI6IlRlc3RRUVFRRmlyc3QiLCJmYW1pbHlfbmFtZSI6IlRlc3RRUVFRTGFzdCIsInJvbGUiOiJBZG1pbmlzdHJhdG9yIiwiZWxmaF91c2VyTmFtZSI6IlRlc3RRUVFRIiwianRpIjoiQ0JBRTRFODY3QjM1M0FGMDcxNDQ2NUI5NEJBRjUyOEYiLCJzaWQiOiIxRURDNTUyRUREMDVFNEI2ODk3REFEQzI1MTVCQUZENSIsImlhdCI6MTc1MDI0NjU3MSwic2NvcGUiOlsibGVhcm5pbmdodWJhcGkiXSwiYW1yIjpbInB3ZCJdfQ.spMsOk4OAB9CDMEleutkmRygzOgOFXq15MFvHP9I0WmWHYWJOLwO-0GmfV5MzDvP-ovYQvuphE5XDJibpyzfOkGAMeFq58o2PwzHvmDfDNhqsgexBd8pXm6VEin_obj70hngvG_VFD1_JkndrT7_091fU4St6Z6_UfyVvKYD9uSOwpbr5UaBAtJYbYnB3p_0C5qtzLUhKK6Xjgbr_BMLKTo9d0RGRJ5an16_VYh8Vm3gOxBjdfizzEyOoGOns2tROPB3WO6z1RO5jODVALzZDORs_ad6wlMDq4-cORBHuRbOIwOQW6k7xLIIex5VKTEebFBwAP8ihS6SvsGa16Fs-A'
18+
// -H 'Authorization: Bearer '
1919

2020
// {
2121
// "stats": {

‎TELBlazor.Components/TELBlazor.Components.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@
4848
<Content Remove="..\CICDPackageLocation\**\*" />
4949
<None Remove="..\CICDPackageLocation\**\*" />
5050
</ItemGroup>
51-
<ItemGroup>
51+
<!--qqqq remove <ItemGroup>
5252
<Compile Remove="TELBlazorPackageVersion\VersionInfo.TELBlazorAssembly.cs" />
5353
</ItemGroup>
5454
<ItemGroup>
55+
<Compile Include="TELBlazorPackageVersion\VersionInfo.TELBlazorAssembly.cs" />
5556
<Content Include="TELBlazorPackageVersion\VersionInfo.TELBlazorAssembly.cs" />
56-
</ItemGroup>
57+
</ItemGroup>-->
5758

5859
<!--<ItemGroup>
5960
<Content Include="Core\DI\gitinclude.txt" />

‎TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.TELBlazor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
namespace TELBlazor.Components.TELBlazorPackageVersion{public static partial class VersionInfo{public const string TELBlazorPackageVersion = "1.9.2-local" ;
1+
namespace TELBlazor.Components.TELBlazorPackageVersion{public static partial class VersionInfo{public const string TELBlazorPackageVersion = "1.9.3-local" ;
22
} }

0 commit comments

Comments
 (0)