Skip to content

Commit 2dcc7fb

Browse files
authored
Merge pull request #1464 from DNNCommunity/release/0.28.0
Released v0.28.0
2 parents 46c8407 + cc5b405 commit 2dcc7fb

34 files changed

Lines changed: 15741 additions & 19472 deletions

File tree

.github/workflows/Deploy.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,23 @@ on:
2525
tags:
2626
- 'v*'
2727

28+
permissions:
29+
id-token: write
30+
contents: write
31+
2832
jobs:
2933
ubuntu-latest:
3034
name: ubuntu-latest
3135
runs-on: ubuntu-latest
3236
steps:
33-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v6
3438
with:
3539
fetch-depth: 0
40+
- uses: actions/setup-node@v6
41+
with:
42+
node-version: '24'
43+
registry-url: 'https://registry.npmjs.org'
3644
- name: 'Run: Deploy'
3745
run: ./build.cmd Deploy
3846
env:
3947
GithubToken: ${{ secrets.GITHUB_TOKEN }}
40-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/PR_Validation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
name: ubuntu-latest
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v6
3333
with:
3434
fetch-depth: 0
35-
- name: 'Run: Compile'
36-
run: ./build.cmd Compile
35+
- name: 'Run: Compile, BuildStorybook'
36+
run: ./build.cmd Compile BuildStorybook
3737
env:
3838
GithubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Publish_Site.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: ubuntu-latest
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 0
3333
- name: 'Run: PublishSite'

.nuke/build.schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"ExecutableTarget": {
2525
"type": "string",
2626
"enum": [
27+
"BuildStorybook",
2728
"Clean",
2829
"Compile",
2930
"CreateDeployBranch",

_build/Build.cs

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,24 @@
3030
GitHubActionsImage.UbuntuLatest,
3131
ImportSecrets = new[] { nameof(GithubToken) },
3232
OnPullRequestBranches = new[] { "main", "master", "develop", "development" },
33-
InvokedTargets = new[] { nameof(Compile) },
33+
InvokedTargets = new[] { nameof(Compile), nameof(BuildStorybook) },
3434
FetchDepth = 0,
3535
CacheKeyFiles = new string[] {}
3636
)]
3737
[GitHubActions(
3838
"Deploy",
3939
GitHubActionsImage.UbuntuLatest,
40-
ImportSecrets = new[] { nameof(GithubToken), "NPM_TOKEN" },
40+
ImportSecrets = new[] { nameof(GithubToken) },
4141
OnPushBranches = new[] { "main", "master", "release/*" },
4242
OnPushTags = new[] { "v*" },
4343
InvokedTargets = new[] { nameof(Deploy) },
4444
FetchDepth = 0,
45-
CacheKeyFiles = new string[] {}
45+
CacheKeyFiles = new string[] {},
46+
WritePermissions = new[] {
47+
GitHubActionsPermissions.IdToken,
48+
GitHubActionsPermissions.Contents,
49+
},
50+
AutoGenerate = false
4651
)]
4752
[GitHubActions(
4853
"Publish_Site",
@@ -263,23 +268,26 @@ class Build : NukeBuild
263268
.DependsOn(TagRelease)
264269
.DependsOn(Release)
265270
.Executes(() => {
266-
var npmToken = Environment.GetEnvironmentVariable("NPM_TOKEN");
267-
var npmrcFile = RootDirectory / ".npmrc";
268-
npmrcFile.WriteAllText($"//registry.npmjs.org/:_authToken={npmToken}");
269271
var tag = gitRepository.IsOnMainOrMasterBranch() ? "latest" : "next";
270-
Npm($"publish --access public --tag {tag} --workspaces");
272+
Npm($"publish --access public --tag {tag} --workspaces --provenance");
271273
});
272274

273275
Target PublishSite => _ => _
274276
.DependsOn(CreateDeployBranch)
275-
.DependsOn(Compile)
277+
.DependsOn(BuildStorybook)
276278
.Executes(() =>
277279
{
278280
NpmRun(s => s
279281
.SetProcessWorkingDirectory(StencilDirectory)
280-
.SetCommand("build-storybook"));
282+
.SetCommand("deploy-storybook"));
283+
});
284+
285+
Target BuildStorybook => _ => _
286+
.DependsOn(Compile)
287+
.Executes(() =>
288+
{
281289
NpmRun(s => s
282290
.SetProcessWorkingDirectory(StencilDirectory)
283-
.SetCommand("deploy-storybook"));
291+
.SetCommand("build-storybook"));
284292
});
285293
}

_build/_build.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<NoWarn>CS0649;CS0169</NoWarn>
88
<NukeRootDirectory>..</NukeRootDirectory>
@@ -11,11 +11,11 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Nuke.Common" Version="9.0.4" />
14+
<PackageReference Include="Nuke.Common" Version="10.1.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageDownload Include="GitVersion.Tool" Version="[5.11.1]" />
18+
<PackageDownload Include="GitVersion.Tool" Version="[6.6.0]" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.202",
3+
"version": "10.0.103",
44
"rollForward": "latestMajor"
55
}
66
}

0 commit comments

Comments
 (0)