Merge remote-tracking branch 'origin/dev' into issue/OSOE-677

Lombiq · Nov 8, 2023 · 1037738 · 1037738
2 parents 160879f + 9babe2f
commit 1037738
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -13,13 +13,15 @@ jobs:
     name: Build and Test - root solution (larger runners)
     uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
     with:
-      machine-types: "['gitrunners-ubuntu-2204-x64-4vcpu']"
+      machine-types: "['buildjet-4vcpu-ubuntu-2204']"
       timeout-minutes: 20
       set-up-sql-server: "true"
       set-up-azurite: "true"
       ui-test-parallelism: 0
       build-create-binary-log: "true"
       blame-hang-timeout: "5m"
+      build-enable-nuget-caching: "true"
+      build-enable-npm-caching: "true"
 
   build-and-test-standard-runners:
     # Since dev builds are not awaited by anyone, they can run on the slower free runners.

diff --git a/tools/Lombiq.GitHub.Actions b/tools/Lombiq.GitHub.Actions
+10 −2		.github/actions/build-dotnet/action.yml
+24 −0		.github/actions/check-issues-are-enabled/action.yml
+6 −0		.github/actions/update-github-issue-and-pull-request/Update-GitHubIssueAndPullRequest.ps1
+7 −6		.github/workflows/build-and-test-dotnet.yml
+3 −5		.github/workflows/build-and-test-orchard-core.yml
+5 −5		.github/workflows/build-dotnet.yml
+7 −7		.github/workflows/deploy-to-azure-app-service.yml
+7 −7		.github/workflows/test-analysis-failure.yml
+7 −1		.github/workflows/validate-pull-request.yml
+7 −1		.github/workflows/validate-submodule-pull-request.yml
+1 −0		Docs/Actions.md
+7 −4		Docs/Workflows.md