-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8773: Recompiling client-side assets on 1.10.x (#8779)
* Updating rebuilt client-side assets that only changed in terms of sourceMappingURL * Updating rebuilt client-side assets that changed functionally * Fixing/simplifying Layout editor toolbox stickyness and height restriction to viewport * Compile workflow: Upgrading actions/checkout and microsoft/setup-msbuild actions to their latest versions * Compile workflow: Adding steps to validate that the client-side assets are up-to-date * Compile workflow: Temporarily disabling MSBuild steps * Moving client-side assets build to a separate job in the compile workflow * Updating client-side compilation job * Temporarily disabling the .NET build * Separating package install from asset rebuild * Adding debug command * Fixing working directory * Debugging * Attempting to get rid of false positives due to line ending changes * Removing debug code * Checking asset validation by modifying Orchard.Resources/Assets/Less/Bootstrap/variables.less, but not its derivatives * Revert "Checking asset validation by modifying Orchard.Resources/Assets/Less/Bootstrap/variables.less, but not its derivatives" This reverts commit 3fc9b83. * Revert "Temporarily disabling the .NET build" This reverts commit 2a8fef7. * Fixing error message when client-side assets are not up-to-date
- Loading branch information
1 parent
8086c01
commit 530d2a9
Showing
249 changed files
with
1,314 additions
and
1,614 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,25 +9,61 @@ on: | |
- 1.10.x | ||
|
||
jobs: | ||
compile: | ||
name: Compile | ||
compile-dotnet: | ||
name: Compile .NET solution | ||
defaults: | ||
run: | ||
shell: pwsh | ||
runs-on: windows-latest | ||
|
||
steps: | ||
- name: Clone repository | ||
uses: actions/checkout@v3.1.0 | ||
uses: actions/checkout@v4.1.1 | ||
|
||
- name: Restore NuGet packages | ||
run: nuget restore src/Orchard.sln | ||
|
||
- name: Add msbuild to PATH | ||
uses: microsoft/setup-msbuild@v1.3.1 | ||
uses: microsoft/setup-msbuild@v2 | ||
|
||
- name: Compile | ||
run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:MvcBuildViews=true /p:TreatWarningsAsErrors=true -WarnAsError | ||
|
||
- name: Test | ||
run: msbuild Orchard.proj /m /v:minimal /t:Test | ||
|
||
compile-node: | ||
name: Compile client-side assets | ||
defaults: | ||
run: | ||
shell: pwsh | ||
runs-on: windows-latest | ||
steps: | ||
- name: Clone repository | ||
uses: actions/[email protected] | ||
|
||
- name: Setup NodeJS | ||
uses: actions/[email protected] | ||
with: | ||
node-version: '7' | ||
|
||
- name: Setup NPM packages | ||
working-directory: ./src | ||
run: | | ||
npm install --loglevel warn | ||
# Install gulp globally to be able to run the rebuild task, using the same version as in the project. | ||
$gulpVersion = (Get-Content Package.json -Raw | ConvertFrom-Json).devDependencies.gulp | ||
Start-Process npm -NoNewWindow -Wait -ArgumentList "install gulp@$gulpVersion -g --loglevel warn" | ||
- name: Rebuild client-side assets | ||
working-directory: ./src | ||
run: | | ||
gulp rebuild | ||
git add . # To make line ending changes "disappear". | ||
$gitStatus = (git status --porcelain) | ||
if ($gitStatus) | ||
{ | ||
throw ("Client-side assets are not up-to-date. Please run 'gulp rebuild' and commit the changes.`n" + | ||
[System.String]::Join([System.Environment]::NewLine, $gitStatus)) | ||
} |
2 changes: 1 addition & 1 deletion
2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/console-shim.js
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/dash.all.js
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/jstree.js
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/swfobject.js
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-admin-common.js
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-admin-settings.js
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-autorefresh.js
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/cloudmedia-edit-asset-video.js
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.