Skip to content

Commit

Permalink
Merge branch 'master' into arm32
Browse files Browse the repository at this point in the history
  • Loading branch information
agile.zhou committed Dec 29, 2024
2 parents d2e23d2 + 432f283 commit 85a22da
Show file tree
Hide file tree
Showing 267 changed files with 10,159 additions and 12,301 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/arm32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- run: npm install
- run: npm run build
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: agileconfig-ui
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
Expand All @@ -45,7 +45,7 @@ jobs:
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: agileconfig-ui
path: src/AgileConfig.Server.Apisite/wwwroot/ui
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- run: npm install
- run: npm run build
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: agileconfig-ui
path: AgileConfig.Server.UI/react-ui-antd/dist/
Expand All @@ -46,7 +46,7 @@ jobs:
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: agileconfig-ui
path: AgileConfig.Server.Apisite/wwwroot/ui
Expand Down
42 changes: 16 additions & 26 deletions .github/workflows/master-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ on:
branches: [ master ]
paths-ignore:
- '**/*.md'
- '**/*.yml'
pull_request:
branches: [ master ]
workflow_dispatch:

jobs:
build-reactapp:
runs-on: ubuntu-latest
Expand All @@ -29,32 +24,27 @@ jobs:

- run: npm install
- run: npm run build
- uses: actions/upload-artifact@v2
with:
name: agileconfig-ui
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
build-dotnet:
needs: build-reactapp
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.*
- name: Install dependencies
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- uses: actions/download-artifact@v2
with:
name: agileconfig-ui
path: src/AgileConfig.Server.Apisite/wwwroot/ui
- name: Push to Docker Hub
uses: docker/build-push-action@v1
run: dotnet build --no-restore
- name: Test
run: dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
username: ${{ secrets.DOCKER_HUB_NAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
repository: kklldog/agile_config
tags: test
directory: ./coverage
fail_ci_if_error: false
flags: unittests
name: agileconfig
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true
41 changes: 41 additions & 0 deletions .github/workflows/master-pr-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: master pr ci workflow

on:
pull_request:
branches: [ master ]
workflow_dispatch:

jobs:
build-reactapp:
runs-on: ubuntu-latest
defaults:
run:
working-directory: src/AgileConfig.Server.UI/react-ui-antd
strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- run: npm install
- run: npm run build
build-dotnet:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --no-restore
- name: Test
run: dotnet test --no-build --verbosity normal
4 changes: 2 additions & 2 deletions .github/workflows/mysqlconnector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- run: npm install
- run: npm run build
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: agileconfig-ui
path: AgileConfig.Server.UI/react-ui-antd/dist/
Expand All @@ -46,7 +46,7 @@ jobs:
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: agileconfig-ui
path: AgileConfig.Server.Apisite/wwwroot/ui
Expand Down
52 changes: 0 additions & 52 deletions .github/workflows/preview-dotnet.yml

This file was deleted.

18 changes: 15 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:

- run: npm install
- run: npm run build
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: agileconfig-ui
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
build-dotnet:
build-dotnet-push-to-hub:
needs: build-reactapp
runs-on: ubuntu-latest

Expand All @@ -45,7 +45,7 @@ jobs:
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: agileconfig-ui
path: src/AgileConfig.Server.Apisite/wwwroot/ui
Expand All @@ -56,3 +56,15 @@ jobs:
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
repository: kklldog/agile_config
tags: latest
- name: Login to ACR and push
uses: aliyun/acr-login@v1
with:
login-server: https://registry.cn-shanghai.aliyuncs.com
username: "${{ secrets.ALI_REGISTRY_USERNAME }}"
password: "${{ secrets.ALI_REGISTRY_PASSWORD }}"
- name: Build and push image
env:
IMAGE_TAG: latest
run: |
docker build -t registry.cn-shanghai.aliyuncs.com/kklldog/agile_config:$IMAGE_TAG .
docker push registry.cn-shanghai.aliyuncs.com/kklldog/agile_config:$IMAGE_TAG
4 changes: 2 additions & 2 deletions .github/workflows/release-xxx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- run: npm install
- run: npm run build
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: agileconfig-ui
path: src/AgileConfig.Server.UI/react-ui-antd/dist/
Expand All @@ -45,7 +45,7 @@ jobs:
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: agileconfig-ui
path: src/AgileConfig.Server.Apisite/wwwroot/ui
Expand Down
77 changes: 77 additions & 0 deletions .github/workflows/test-cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: master test tag release workflow

on:
push:
paths-ignore:
- '**/*.md'
- '**/*.yml'
tags:
- 'test-*'
workflow_dispatch:
jobs:
build-reactapp:
runs-on: ubuntu-latest
defaults:
run:
working-directory: src/AgileConfig.Server.UI/react-ui-antd
strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- run: npm install
- run: npm run build

- uses: actions/upload-artifact@v4
with:
name: agileconfig-ui
path: src/AgileConfig.Server.UI/react-ui-antd/dist/

build-dotnet-push-to-hub:
needs: build-reactapp
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.*

- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore

- uses: actions/download-artifact@v4
with:
name: agileconfig-ui
path: src/AgileConfig.Server.Apisite/wwwroot/ui

- name: Push to Docker Hub
uses: docker/build-push-action@v1
with:
username: ${{ secrets.DOCKER_HUB_NAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
repository: kklldog/agile_config
tags: test

- name: Login to ACR and push
uses: aliyun/acr-login@v1
with:
login-server: https://registry.cn-shanghai.aliyuncs.com
username: "${{ secrets.ALI_REGISTRY_USERNAME }}"
password: "${{ secrets.ALI_REGISTRY_PASSWORD }}"

- name: Build and push image
env:
IMAGE_TAG: test
run: |
docker build -t registry.cn-shanghai.aliyuncs.com/kklldog/agile_config:$IMAGE_TAG .
docker push registry.cn-shanghai.aliyuncs.com/kklldog/agile_config:$IMAGE_TAG
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,4 @@ __pycache__/
/src/AgileConfig.Server.Apisite/agile_config_TEST.db
/src/AgileConfig.Server.Apisite/wwwroot/ui/
/src/AgileConfig.Server.Apisite/agile_config.db
/coverage
Loading

0 comments on commit 85a22da

Please sign in to comment.