yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v13/dev' into v14/dev

Browse Source 
# Conflicts:
#	build/azure-pipelines.yml
This commit is contained in:
Bjarke Berg
2023-08-21 08:05:22 +02:00
parent 0096addcb9 84cd7a163c
commit 6f10517fc6
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/azure-pipelines.yml
View File

@@ -39,7 +39,6 @@ stages:
## Build
###############################################
- stage: Build
variables:
npm_config_cache: $(Pipeline.Workspace)/.npm_client
NODE_OPTIONS: --max_old_space_size=16384
@@ -381,7 +380,7 @@ stages:
# Umbraco__CMS__Unattended__InstallUnattended: true
# Umbraco__CMS__Global__InstallMissingDatabase: true
# UmbracoDatabaseServer: (LocalDB)\MSSQLLocalDB
# UmbracoDatabaseName: Playwright
# UmbracoDatabaseName: AcceptanceTestDB
# ConnectionStrings__umbracoDbDSN: Server=$(UmbracoDatabaseServer);Database=$(UmbracoDatabaseName);Integrated Security=true;
# # Custom Umbraco settings
# Umbraco__CMS__Global__VersionCheckPeriod: 0
@@ -441,7 +440,7 @@ stages:
# workingDirectory: tests/Umbraco.Tests.AcceptanceTest/misc
# - pwsh: |
# dotnet new --install ./nupkg/Umbraco.Templates.*.nupkg
# dotnet new umbraco --name Playwright --no-restore --output .
# dotnet new umbraco --name AcceptanceTestProject --no-restore --output .
# dotnet restore --configfile ./nuget.config
# dotnet build --configuration $(buildConfiguration) --no-restore
# dotnet dev-certs https

4
tests/Umbraco.Tests.AcceptanceTest/misc/umbraco-linux.docker
View File

@@ -13,7 +13,7 @@ COPY nupkg .
WORKDIR /build
RUN dotnet new --install /nupkg/Umbraco.Templates.*.nupkg
RUN dotnet new umbraco --name Playwright --no-restore --output .
RUN dotnet new umbraco --name AcceptanceTestProject --no-restore --output .
RUN dotnet restore --configfile /nuget.config
RUN dotnet build --configuration Release --no-restore
RUN dotnet publish --configuration Release --no-build --output /dist
@@ -48,4 +48,4 @@ ENV Umbraco__CMS__KeepAlive__DisableKeepAliveTask="true"
# Set application URL
ENV ASPNETCORE_URLS="http://0.0.0.0:5000;https://0.0.0.0:5001"
CMD dotnet Playwright.dll
CMD dotnet AcceptanceTestProject.dll