Skip to content

Commit 9b0ce08

Browse files
authored
chore: update workflows to match new branch structure
1 parent d6031c6 commit 9b0ce08

File tree

5 files changed

+34
-85
lines changed

5 files changed

+34
-85
lines changed

.github/workflows/dotnet-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: .NET Release
33
on:
44
push:
55
branches:
6-
- master
7-
- next
6+
- main
7+
- release
88

99
jobs:
1010
semantic-release:

.github/workflows/dotnet-test.yml

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,16 @@ name: .NET Testing
33
on:
44
pull_request:
55
branches:
6-
- "**"
6+
- '**'
7+
8+
concurrency:
9+
group: testing-${{ github.ref }}
10+
cancel-in-progress: true
711

812
jobs:
913
test:
10-
name: Execute Test ${{ matrix.project }}
14+
name: Testing
1115
runs-on: ubuntu-latest
12-
strategy:
13-
fail-fast: true
14-
matrix:
15-
include:
16-
- project: KubeOps.KubernetesClient.Test
17-
kubernetes: true
18-
- project: KubeOps.Test
19-
kubernetes: false
20-
- project: KubeOps.Templates.Test
21-
kubernetes: false
22-
- project: KubeOps.TestOperator.Test
23-
kubernetes: false
2416
steps:
2517
- uses: actions/checkout@v3
2618

@@ -31,21 +23,6 @@ jobs:
3123

3224
- name: Create Kubernetes Cluster
3325
uses: helm/[email protected]
34-
if: ${{ matrix.kubernetes == true }}
3526

3627
- name: Execute Tests
37-
run: dotnet test --configuration Release tests/${{ matrix.project }}
38-
39-
result:
40-
if: ${{ always() }}
41-
runs-on: ubuntu-latest
42-
name: Final Results
43-
needs: [test]
44-
steps:
45-
- run: |
46-
result="${{ needs.test.result }}"
47-
if [[ $result == "success" || $result == "skipped" ]]; then
48-
exit 0
49-
else
50-
exit 1
51-
fi
28+
run: dotnet test --configuration Release

.github/workflows/gh-pages.yml

Lines changed: 7 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy GitHub Pages
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
workflow_dispatch:
99

@@ -21,55 +21,18 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v3
24-
with:
25-
fetch-depth: 1
26-
27-
- run: mkdir public
28-
29-
- name: Build Index
30-
uses: jaywcjlove/markdown-to-html-cli@main
31-
with:
32-
source: res/docs_index.md
33-
output: public/index.html
34-
github-corners: https://github.com/buehler/dotnet-operator-sdk
35-
36-
- name: Build Contribution
37-
uses: jaywcjlove/markdown-to-html-cli@main
38-
with:
39-
source: CONTRIBUTING.md
40-
output: public/contribution.html
41-
github-corners: https://github.com/buehler/dotnet-operator-sdk
4224

43-
- name: Build KubeOps
44-
uses: jaywcjlove/markdown-to-html-cli@main
25+
- name: Setup .NET
26+
uses: actions/setup-dotnet@v3
4527
with:
46-
source: src/KubeOps/README.md
47-
output: public/kubeops.html
48-
github-corners: https://github.com/buehler/dotnet-operator-sdk/tree/master/src/KubeOps
28+
dotnet-version: 7.x
4929

50-
- name: Build KubeOps.KubernetesClient
51-
uses: jaywcjlove/markdown-to-html-cli@main
52-
with:
53-
source: src/KubeOps.KubernetesClient/README.md
54-
output: public/kubeops-kubernetesclient.html
55-
github-corners: https://github.com/buehler/dotnet-operator-sdk/tree/master/src/KubeOps.KubernetesClient
30+
- run: dotnet tool restore
5631

57-
- name: Build KubeOps.Templates
58-
uses: jaywcjlove/markdown-to-html-cli@main
59-
with:
60-
source: src/KubeOps.Templates/README.md
61-
output: public/kubeops-templates.html
62-
github-corners: https://github.com/buehler/dotnet-operator-sdk/tree/master/src/KubeOps.Templates
63-
64-
- name: Build KubeOps.Testing
65-
uses: jaywcjlove/markdown-to-html-cli@main
66-
with:
67-
source: src/KubeOps.Testing/README.md
68-
output: public/kubeops-testing.html
69-
github-corners: https://github.com/buehler/dotnet-operator-sdk/tree/master/src/KubeOps.Testing
32+
- run: dotnet docfx
7033

7134
- uses: actions/upload-pages-artifact@v1
7235
with:
73-
path: public
36+
path: _site
7437

7538
- uses: actions/deploy-pages@v1

.github/workflows/security-analysis.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ name: Code Security Testing
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
7+
- release
78
schedule:
8-
- cron: "0 20 * * 5"
9+
- cron: '0 20 * * 5'
10+
11+
concurrency:
12+
group: security-${{ github.ref }}
13+
cancel-in-progress: true
914

1015
jobs:
1116
codeQL:
@@ -15,7 +20,7 @@ jobs:
1520
strategy:
1621
fail-fast: false
1722
matrix:
18-
language: ["csharp"]
23+
language: ['csharp']
1924

2025
steps:
2126
- uses: actions/checkout@v3

.releaserc.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
{
22
"debug": true,
33
"branches": [
4-
"master",
54
{
6-
"name": "next",
7-
"prerelease": "prerelease"
8-
}
5+
"name": "maintenance/7.x",
6+
"range": "7.x"
7+
},
8+
{
9+
"name": "main",
10+
"prerelease": "pre"
11+
},
12+
"release"
913
],
1014
"plugins": [
1115
"@semantic-release/commit-analyzer",
@@ -29,10 +33,10 @@
2933
"@semantic-release/github",
3034
{
3135
"successComment": false,
32-
"failComment": false,
36+
"failComment": true,
3337
"assets": [
3438
{
35-
"path": "artifacts/*.nupkg"
39+
"path": "src/**/bin/Release/**/*.nupkg"
3640
}
3741
]
3842
}

0 commit comments

Comments
 (0)