Skip to content

Commit 835851f

Browse files
committed
Simplifying CI workflow
1 parent 8dafccd commit 835851f

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
name: PR - CI
1+
name: CI
22

33
on:
44
pull_request:
55
branches: [ main ]
6+
push:
7+
branches: [ main ]
68

79
concurrency:
810
group: ${{ github.head_ref || github.run_id }}
@@ -13,19 +15,19 @@ env:
1315
DOTNET_CLI_TELEMETRY_OPTOUT: true
1416

1517
jobs:
16-
build_test:
18+
build:
19+
name: Build
1720
runs-on: ${{ matrix.os }}
1821
strategy:
1922
fail-fast: false
2023
matrix:
2124
os: [ubuntu-24.04, windows-2022]
22-
name: Build & Test
25+
2326
steps:
2427
- uses: actions/checkout@v4
25-
- uses: actions/setup-node@v4
26-
with:
27-
node-version: "15"
28+
2829
- uses: OrchardCMS/OrchardCore/.github/actions/setup-dotnet@main
30+
2931
- name: Build
3032
# We disable NuGet audit warnings, see https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904.
3133
# Security issues being discovered in NuGet packages we use can happen at any time, and thus all our CI builds that

OrchardCore.Samples.sln

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2222
EndProject
2323
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DashboardApplication", "DashboardApplication\DashboardApplication.csproj", "{1E751DAB-8A21-48EB-96E4-F0ED9C999462}"
2424
EndProject
25+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
26+
EndProject
27+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{8BC87CB0-F8FD-427D-8F6D-CC95D6EA23FA}"
28+
ProjectSection(SolutionItems) = preProject
29+
.github\workflows\ci.yml = .github\workflows\ci.yml
30+
EndProjectSection
31+
EndProject
2532
Global
2633
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2734
Debug|Any CPU = Debug|Any CPU
@@ -52,6 +59,9 @@ Global
5259
GlobalSection(SolutionProperties) = preSolution
5360
HideSolutionNode = FALSE
5461
EndGlobalSection
62+
GlobalSection(NestedProjects) = preSolution
63+
{8BC87CB0-F8FD-427D-8F6D-CC95D6EA23FA} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
64+
EndGlobalSection
5565
GlobalSection(ExtensibilityGlobals) = postSolution
5666
SolutionGuid = {0AD5090C-3961-4E2B-9C72-D91ED2E7C1FA}
5767
EndGlobalSection

0 commit comments

Comments
 (0)