Skip to content

Commit 85a22da

Browse files
author
agile.zhou
committed
Merge branch 'master' into arm32
2 parents d2e23d2 + 432f283 commit 85a22da

File tree

267 files changed

+10159
-12301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

267 files changed

+10159
-12301
lines changed

‎.github/workflows/arm32.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- run: npm install
2929
- run: npm run build
30-
- uses: actions/upload-artifact@v2
30+
- uses: actions/upload-artifact@v4
3131
with:
3232
name: agileconfig-ui
3333
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
@@ -45,7 +45,7 @@ jobs:
4545
run: dotnet restore
4646
- name: Build
4747
run: dotnet build --configuration Release --no-restore
48-
- uses: actions/download-artifact@v2
48+
- uses: actions/download-artifact@v4
4949
with:
5050
name: agileconfig-ui
5151
path: src/AgileConfig.Server.Apisite/wwwroot/ui

‎.github/workflows/arm64.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- run: npm install
3030
- run: npm run build
31-
- uses: actions/upload-artifact@v2
31+
- uses: actions/upload-artifact@v4
3232
with:
3333
name: agileconfig-ui
3434
path: AgileConfig.Server.UI/react-ui-antd/dist/
@@ -46,7 +46,7 @@ jobs:
4646
run: dotnet restore
4747
- name: Build
4848
run: dotnet build --configuration Release --no-restore
49-
- uses: actions/download-artifact@v2
49+
- uses: actions/download-artifact@v4
5050
with:
5151
name: agileconfig-ui
5252
path: AgileConfig.Server.Apisite/wwwroot/ui

‎.github/workflows/master-ci.yml‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ on:
55
branches: [ master ]
66
paths-ignore:
77
- '**/*.md'
8-
- '**/*.yml'
9-
pull_request:
10-
branches: [ master ]
11-
workflow_dispatch:
12-
138
jobs:
149
build-reactapp:
1510
runs-on: ubuntu-latest
@@ -29,32 +24,27 @@ jobs:
2924

3025
- run: npm install
3126
- run: npm run build
32-
- uses: actions/upload-artifact@v2
33-
with:
34-
name: agileconfig-ui
35-
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
3627
build-dotnet:
37-
needs: build-reactapp
3828
runs-on: ubuntu-latest
3929

4030
steps:
41-
- uses: actions/checkout@v2
42-
- name: Setup .NET Core
43-
uses: actions/setup-dotnet@v1
31+
- uses: actions/checkout@v3
32+
- name: Setup .NET
33+
uses: actions/setup-dotnet@v3
4434
with:
45-
dotnet-version: 8.0.*
46-
- name: Install dependencies
35+
dotnet-version: 8.0.x
36+
- name: Restore dependencies
4737
run: dotnet restore
4838
- name: Build
49-
run: dotnet build --configuration Release --no-restore
50-
- uses: actions/download-artifact@v2
51-
with:
52-
name: agileconfig-ui
53-
path: src/AgileConfig.Server.Apisite/wwwroot/ui
54-
- name: Push to Docker Hub
55-
uses: docker/build-push-action@v1
39+
run: dotnet build --no-restore
40+
- name: Test
41+
run: dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage
42+
- name: Upload coverage to Codecov
43+
uses: codecov/codecov-action@v4
5644
with:
57-
username: ${{ secrets.DOCKER_HUB_NAME }}
58-
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
59-
repository: kklldog/agile_config
60-
tags: test
45+
directory: ./coverage
46+
fail_ci_if_error: false
47+
flags: unittests
48+
name: agileconfig
49+
token: ${{ secrets.CODECOV_TOKEN }}
50+
verbose: true

‎.github/workflows/master-pr-ci.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: master pr ci workflow
2+
3+
on:
4+
pull_request:
5+
branches: [ master ]
6+
workflow_dispatch:
7+
8+
jobs:
9+
build-reactapp:
10+
runs-on: ubuntu-latest
11+
defaults:
12+
run:
13+
working-directory: src/AgileConfig.Server.UI/react-ui-antd
14+
strategy:
15+
matrix:
16+
node-version: [16.x]
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v1
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
25+
- run: npm install
26+
- run: npm run build
27+
build-dotnet:
28+
runs-on: ubuntu-latest
29+
30+
steps:
31+
- uses: actions/checkout@v3
32+
- name: Setup .NET
33+
uses: actions/setup-dotnet@v3
34+
with:
35+
dotnet-version: 8.0.x
36+
- name: Restore dependencies
37+
run: dotnet restore
38+
- name: Build
39+
run: dotnet build --no-restore
40+
- name: Test
41+
run: dotnet test --no-build --verbosity normal

‎.github/workflows/mysqlconnector.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
- run: npm install
3030
- run: npm run build
31-
- uses: actions/upload-artifact@v2
31+
- uses: actions/upload-artifact@v4
3232
with:
3333
name: agileconfig-ui
3434
path: AgileConfig.Server.UI/react-ui-antd/dist/
@@ -46,7 +46,7 @@ jobs:
4646
run: dotnet restore
4747
- name: Build
4848
run: dotnet build --configuration Release --no-restore
49-
- uses: actions/download-artifact@v2
49+
- uses: actions/download-artifact@v4
5050
with:
5151
name: agileconfig-ui
5252
path: AgileConfig.Server.Apisite/wwwroot/ui

‎.github/workflows/preview-dotnet.yml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎.github/workflows/publish.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727

2828
- run: npm install
2929
- run: npm run build
30-
- uses: actions/upload-artifact@v2
30+
- uses: actions/upload-artifact@v4
3131
with:
3232
name: agileconfig-ui
3333
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
34-
build-dotnet:
34+
build-dotnet-push-to-hub:
3535
needs: build-reactapp
3636
runs-on: ubuntu-latest
3737

@@ -45,7 +45,7 @@ jobs:
4545
run: dotnet restore
4646
- name: Build
4747
run: dotnet build --configuration Release --no-restore
48-
- uses: actions/download-artifact@v2
48+
- uses: actions/download-artifact@v4
4949
with:
5050
name: agileconfig-ui
5151
path: src/AgileConfig.Server.Apisite/wwwroot/ui
@@ -56,3 +56,15 @@ jobs:
5656
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
5757
repository: kklldog/agile_config
5858
tags: latest
59+
- name: Login to ACR and push
60+
uses: aliyun/acr-login@v1
61+
with:
62+
login-server: https://registry.cn-shanghai.aliyuncs.com
63+
username: "${{ secrets.ALI_REGISTRY_USERNAME }}"
64+
password: "${{ secrets.ALI_REGISTRY_PASSWORD }}"
65+
- name: Build and push image
66+
env:
67+
IMAGE_TAG: latest
68+
run: |
69+
docker build -t registry.cn-shanghai.aliyuncs.com/kklldog/agile_config:$IMAGE_TAG .
70+
docker push registry.cn-shanghai.aliyuncs.com/kklldog/agile_config:$IMAGE_TAG

‎.github/workflows/release-xxx.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- run: npm install
2929
- run: npm run build
30-
- uses: actions/upload-artifact@v2
30+
- uses: actions/upload-artifact@v4
3131
with:
3232
name: agileconfig-ui
3333
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
@@ -45,7 +45,7 @@ jobs:
4545
run: dotnet restore
4646
- name: Build
4747
run: dotnet build --configuration Release --no-restore
48-
- uses: actions/download-artifact@v2
48+
- uses: actions/download-artifact@v4
4949
with:
5050
name: agileconfig-ui
5151
path: src/AgileConfig.Server.Apisite/wwwroot/ui

‎.github/workflows/test-cd.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: master test tag release workflow
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- '**/*.md'
7+
- '**/*.yml'
8+
tags:
9+
- 'test-*'
10+
workflow_dispatch:
11+
jobs:
12+
build-reactapp:
13+
runs-on: ubuntu-latest
14+
defaults:
15+
run:
16+
working-directory: src/AgileConfig.Server.UI/react-ui-antd
17+
strategy:
18+
matrix:
19+
node-version: [16.x]
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Use Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
28+
- run: npm install
29+
- run: npm run build
30+
31+
- uses: actions/upload-artifact@v4
32+
with:
33+
name: agileconfig-ui
34+
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
35+
36+
build-dotnet-push-to-hub:
37+
needs: build-reactapp
38+
runs-on: ubuntu-latest
39+
40+
steps:
41+
- uses: actions/checkout@v2
42+
- name: Setup .NET Core
43+
uses: actions/setup-dotnet@v1
44+
with:
45+
dotnet-version: 8.0.*
46+
47+
- name: Install dependencies
48+
run: dotnet restore
49+
- name: Build
50+
run: dotnet build --configuration Release --no-restore
51+
52+
- uses: actions/download-artifact@v4
53+
with:
54+
name: agileconfig-ui
55+
path: src/AgileConfig.Server.Apisite/wwwroot/ui
56+
57+
- name: Push to Docker Hub
58+
uses: docker/build-push-action@v1
59+
with:
60+
username: ${{ secrets.DOCKER_HUB_NAME }}
61+
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
62+
repository: kklldog/agile_config
63+
tags: test
64+
65+
- name: Login to ACR and push
66+
uses: aliyun/acr-login@v1
67+
with:
68+
login-server: https://registry.cn-shanghai.aliyuncs.com
69+
username: "${{ secrets.ALI_REGISTRY_USERNAME }}"
70+
password: "${{ secrets.ALI_REGISTRY_PASSWORD }}"
71+
72+
- name: Build and push image
73+
env:
74+
IMAGE_TAG: test
75+
run: |
76+
docker build -t registry.cn-shanghai.aliyuncs.com/kklldog/agile_config:$IMAGE_TAG .
77+
docker push registry.cn-shanghai.aliyuncs.com/kklldog/agile_config:$IMAGE_TAG

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,3 +267,4 @@ __pycache__/
267267
/src/AgileConfig.Server.Apisite/agile_config_TEST.db
268268
/src/AgileConfig.Server.Apisite/wwwroot/ui/
269269
/src/AgileConfig.Server.Apisite/agile_config.db
270+
/coverage

0 commit comments

Comments
 (0)