Skip to content

Commit a033c98

Browse files
vnbaaijdvoituron
vnbaaij
and
dvoituron
authored
[General] Update GH Actions (#4016)
* Update NuGet package for fixing CVE. See dotnet/announcements#327 * Non-altering change to force mirroring * Clean up issue tester * Small text formatting change to force deploy * Update workflows * Update README * Update to latest JavaScript SDK * Add global.json * Update workflow to use .NET 9 * Remove net10.0 TFM for now * Set dotnet 9.0.204 * Update deploy_demo.yml to use 9.0.204 * Update home page * Also *temporarily* remove .NET 10 TFM for DataGrid Adapters * Update workflows * Try to get preview docs up again * Use latest .NET 9 SDK for GH Actions * Remove mention of v3 site * Update global.json * Test deploy to new SWA * Update JavaScript SDK * Try older JavaScript SDK * Use .204 SDK on all actions * Newer JavaScript SDK with .NET .204 SDK * Deploy demo to 2 SWAs * Fix id's * Evrything tied to .204 and add sub subscription * Get sources copied * Try again * Tweak message * Try again * Try again * Try swa.config.json * Try extension * Update action (remove old sub) * Revert config.json change * Use correct codeql action * Add back build step --------- Co-authored-by: Denis Voituron <[email protected]>
1 parent 8197e48 commit a033c98

File tree

6 files changed

+21
-81
lines changed

6 files changed

+21
-81
lines changed

‎.github/workflows/build-core-lib.yml‎

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/setup-dotnet@v4
5353
with:
5454
dotnet-version: 9.0.205
55-
dotnet-quality: ga
55+
# dotnet-quality: ga
5656

5757
- name: Setup .NET 10.0
5858
uses: actions/setup-dotnet@v4
@@ -175,7 +175,7 @@ jobs:
175175
uses: actions/setup-dotnet@v4
176176
with:
177177
dotnet-version: 9.0.205
178-
dotnet-quality: ga
178+
# dotnet-quality: ga
179179

180180
- name: Setup .NET 10.0
181181
uses: actions/setup-dotnet@v4
@@ -189,22 +189,8 @@ jobs:
189189
- name: .NET Publish
190190
run: dotnet publish ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
191191

192-
- name: Deploy demo site to Azure Static Web App (old subscription)
193-
id: builddeployold
194-
uses: Azure/static-web-apps-deploy@v1
195-
with:
196-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
197-
repo_token: ${{ secrets.GITHUB_TOKEN }}
198-
action: "upload"
199-
app_location: "publish/wwwroot"
200-
api_location: "Api"
201-
output_location: "publish/wwwroot"
202-
skip_api_build: true
203-
skip_app_build: true
204-
production_branch: 'dev'
205-
206-
- name: Deploy demo site to Azure Static Web App (new subscription)
207-
id: builddeploynew
192+
- name: Deploy demo site to Azure Static Web App
193+
id: builddeploy
208194
uses: Azure/static-web-apps-deploy@v1
209195
with:
210196
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
@@ -222,14 +208,8 @@ jobs:
222208
runs-on: ubuntu-latest
223209
name: Close Pull Request Job
224210
steps:
225-
- name: Close Pull Request on Azure Static Web App (old subscription)
226-
id: closepullrequestold
227-
uses: Azure/static-web-apps-deploy@v1
228-
with:
229-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
230-
action: "close"
231-
- name: Close Pull Request on Azure Static Web App (new subscription)
232-
id: closepullrequestnew
211+
- name: Close Pull Request on Azure Static Web App
212+
id: closepullrequest
233213
uses: Azure/static-web-apps-deploy@v1
234214
with:
235215
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
dotnet-quality: preview
4848

4949
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@v2
50+
uses: github/codeql-action/init@v3
5151
with:
5252
languages: ${{ matrix.language }}
5353

@@ -57,4 +57,4 @@ jobs:
5757
dotnet build Microsoft.FluentUI.sln
5858
5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@v2
60+
uses: github/codeql-action/analyze@v3

‎.github/workflows/deploy_demo.yml‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/setup-dotnet@v4
3939
with:
4040
dotnet-version: 9.0.205
41-
dotnet-quality: ga
41+
# dotnet-quality: ga
4242

4343
# - name: Setup .NET 10.0
4444
# uses: actions/setup-dotnet@v4
@@ -54,28 +54,14 @@ jobs:
5454

5555
- run: npm install "src/Core.Assets/"
5656

57-
# - name: .NET Builld
58-
# run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
57+
- name: .NET Builld
58+
run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
5959

6060
- name: .NET Publish
6161
run: dotnet publish ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
6262

63-
- name: Deploy demo site to Azure Static Web App (old subscription)
64-
id: builddeployold
65-
uses: Azure/static-web-apps-deploy@v1
66-
with:
67-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_SEA_053FA6A03 }}
68-
repo_token: ${{ secrets.GITHUB_TOKEN }}
69-
action: "upload"
70-
app_location: "publish/wwwroot"
71-
api_location: "Api"
72-
output_location: "publish/wwwroot"
73-
skip_api_build: true
74-
skip_app_build: true
75-
production_branch: 'main'
76-
77-
- name: Deploy demo site to Azure Static Web App (new subscription)
78-
id: builddeploynew
63+
- name: Deploy demo site to Azure Static Web App
64+
id: builddeploy
7965
uses: Azure/static-web-apps-deploy@v1
8066
with:
8167
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_DESERT_0286DCF03 }}
@@ -93,15 +79,8 @@ jobs:
9379
runs-on: ubuntu-latest
9480
name: Close Pull Request Job
9581
steps:
96-
- name: Close Pull Request on Azure Static Web App (old subscription)
97-
id: closepullrequestold
98-
uses: Azure/static-web-apps-deploy@v1
99-
with:
100-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_SEA_053FA6A03 }}
101-
action: "close"
102-
10382
- name: Close Pull Request on Azure Static Web App (new subscription)
104-
id: closepullrequestnew
83+
id: closepullrequest
10584
uses: Azure/static-web-apps-deploy@v1
10685
with:
10786
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_DESERT_0286DCF03 }}

‎.github/workflows/deploy_preview.yml‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,8 @@ jobs:
4444
- name: .NET Publish
4545
run: dotnet publish ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true --no-build
4646

47-
- name: Deploy demo site to Azure Static Web App (old subscription_)
48-
id: builddeployold
49-
uses: Azure/static-web-apps-deploy@v1
50-
with:
51-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
52-
repo_token: ${{ secrets.GITHUB_TOKEN }}
53-
action: "upload"
54-
app_location: "publish/wwwroot"
55-
api_location: "Api"
56-
output_location: "publish/wwwroot"
57-
skip_api_build: true
58-
skip_app_build: true
59-
production_branch: 'dev'
60-
61-
- name: Deploy demo site to Azure Static Web App (newsubscription)
62-
id: builddeploynew
47+
- name: Deploy demo site to Azure Static Web App
48+
id: builddeployn
6349
uses: Azure/static-web-apps-deploy@v1
6450
with:
6551
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
@@ -77,14 +63,8 @@ jobs:
7763
runs-on: ubuntu-latest
7864
name: Close Pull Request Job
7965
steps:
80-
- name: Close Pull Request on Azure Static Web App (old subscription)
81-
id: closepullrequestold
82-
uses: Azure/static-web-apps-deploy@v1
83-
with:
84-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
85-
action: "close"
86-
- name: Close Pull Request on Azure Static Web App (new subscription)
87-
id: closepullrequestnew
66+
- name: Close Pull Request on Azure Static Web App
67+
id: closepullrequest
8868
uses: Azure/static-web-apps-deploy@v1
8969
with:
9070
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}

‎examples/Demo/Client/wwwroot/staticwebapp.config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"rewrite": "/index.html",
44
"exclude": [ "_content/FluentUI.Demo.Shared/sources/*" ]
55
}
6-
}
6+
}

‎examples/Demo/Shared/FluentUI.Demo.Shared.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<Sources Include="$(ProjectDir)\Components\*" />
6565
<Sources Include="$(ProjectDir)\SampleData\*" />
6666
</ItemGroup>
67-
<Copy SourceFiles="@(Sources)" DestinationFiles="@(Sources->'$(ProjectDir)wwwroot\sources\%(Filename)%(Extension).txt')" SkipUnchangedFiles="true" />
67+
<Copy SourceFiles="@(Sources)" DestinationFiles="@(Sources->'$(ProjectDir)wwwroot/sources/%(Filename)%(Extension).txt')" SkipUnchangedFiles="false" />
68+
<Message Text="Copied sources to $(ProjectDir)wwwroot/sources folder." Importance="high" />
6869
</Target>
6970
</Project>

0 commit comments

Comments
 (0)