Skip to content

Commit

Permalink
Merge pull request #8 from yoyoboot/sync-7.3.0-pk
Browse files Browse the repository at this point in the history
Sync 7.3.0 pk
  • Loading branch information
yihango committed Mar 8, 2024
2 parents 01c3673 + 178dcab commit 5ecf9b1
Show file tree
Hide file tree
Showing 30 changed files with 932 additions and 183 deletions.
24 changes: 0 additions & 24 deletions .github/ISSUE_TEMPLATE

This file was deleted.

58 changes: 58 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: "🕷️ Bug report"
description: Report errors or unexpected behavior
labels:
- bug
body:
- type: checkboxes
attributes:
label: Self Checks
description: "To make sure we get to you in time, please check the following :)"
options:
- label: I have searched for existing issues [search for existing issues](https://github.com/yoyoboot/Yoyo.Abp/issues), including closed ones.
required: true
- label: I confirm that I am using English to submit this report (我已阅读并同意 [Language Policy](https://github.com/yoyoboot/Yoyo.Abp/issues)).
required: true
- label: "Pleas do not modify this template :) and fill in all the required fields."
required: true

- type: input
attributes:
label: Yoyo.Abp version
placeholder: 7.3.0
description: See about section in Version.cs file
validations:
required: true

- type: dropdown
attributes:
label: Cloud or Self Hosted
description: How / Where was Yoyo.Abp installed from?
multiple: true
options:
- Cloud
- Self Hosted (Docker)
- Self Hosted (Source)
validations:
required: true

- type: textarea
attributes:
label: Steps to reproduce
description: We highly suggest including screenshots and a bug report log.
placeholder: Having detailed steps helps us reproduce the bug.
validations:
required: true

- type: textarea
attributes:
label: ✔️ Expected Behavior
placeholder: What were you expecting?
validations:
required: false

- type: textarea
attributes:
label: ❌ Actual Behavior
placeholder: What happened instead?
validations:
required: false
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/document_issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: "📚 Documentation Issue"
description: Report issues in our documentation
labels:
- ducumentation
body:
- type: checkboxes
attributes:
label: Self Checks
description: "To make sure we get to you in time, please check the following :)"
options:
- label: I have searched for existing issues [search for existing issues](https://github.com/yoyoboot/Yoyo.Abp/issues), including closed ones.
required: true
- label: I confirm that I am using English to submit report (我已阅读并同意 [Language Policy](https://github.com/yoyoboot/Yoyo.Abp/issues/1542)).
required: true
- label: "Pleas do not modify this template :) and fill in all the required fields."
required: true
- type: textarea
attributes:
label: Provide a description of requested docs changes
placeholder: Briefly describe which document needs to be corrected and why.
validations:
required: true
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: "⭐ Feature or enhancement request"
description: Propose something new.
labels:
- enhancement
body:
- type: checkboxes
attributes:
label: Self Checks
description: "To make sure we get to you in time, please check the following :)"
options:
- label: I have searched for existing issues [search for existing issues](https://github.com/yoyoboot/Yoyo.Abp/issues), including closed ones.
required: true
- label: I confirm that I am using English to submit this report (我已阅读并同意 [Language Policy](https://github.com/yoyoboot/Yoyo.Abp/issues/1542)).
required: true
- label: "Pleas do not modify this template :) and fill in all the required fields."
required: true
- type: textarea
attributes:
label: 1. Is this request related to a challenge you're experiencing?
placeholder: Please describe the specific scenario or problem you're facing as clearly as possible. For instance "I was trying to use [feature] for [specific task], and [what happened]... It was frustrating because...."
validations:
required: true
- type: textarea
attributes:
label: 2. Describe the feature you'd like to see
placeholder: Think about what you want to achieve and how this feature will help you. Sketches, flow diagrams, or any visual representation will be a major plus.
validations:
required: true
- type: textarea
attributes:
label: 3. How will this feature improve your workflow or experience?
placeholder: Tell us how this change will benefit your work. This helps us prioritize based on user impact.
validations:
required: true
- type: textarea
attributes:
label: 4. Additional context or comments
placeholder: (Any other information, comments, documentations, links, or screenshots that would provide more clarity. This is the place to add anything else not covered above.)
validations:
required: false
- type: checkboxes
attributes:
label: 5. Can you help us with this feature?
description: Let us know! This is not a commitment, but a starting point for collaboration.
options:
- label: I am interested in contributing to this feature.
required: false
- type: markdown
attributes:
value: Please limit one request per issue.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/help_wanted.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: "🤝 Help Wanted"
description: "Request help from the community [please use English :)]"
labels:
- help-wanted
body:
- type: checkboxes
attributes:
label: Self Checks
description: "To make sure we get to you in time, please check the following :)"
options:
- label: I have searched for existing issues [search for existing issues](https://github.com/yoyoboot/Yoyo.Abp/issues), including closed ones.
required: true
- label: I confirm that I am using English to submit this report (我已阅读并同意 [Language Policy](https://github.com/yoyoboot/Yoyo.Abp/issues/1542)).
required: true
- label: "Pleas do not modify this template :) and fill in all the required fields."
required: true
- type: textarea
attributes:
label: Provide a description of the help you need
placeholder: Briefly describe what you need help with.
validations:
required: true
60 changes: 60 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

## Type of Change

Please delete options that are not relevant.

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update

# How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

- [ ] TODO

# Suggested Checklist

- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] My changes generate no new warnings
- [ ] I ran `dev/reformat`(backend) and `cd web && npx lint-staged`(frontend) to appease the lint gods
- [ ] `optional` I have made corresponding changes to the documentation
- [ ] `optional` I have added tests that prove my fix is effective or that my feature works
- [ ] `optional` New and existing unit tests pass locally with my changes

# 说明(中文)

请包含更改摘要和修复的问题。还请包括相关动机和背景。列出此更改所需的任何依赖项。

修复 # (issue)

## 更改类型

请删除不相关的选项。

- [ ] Bug 修复(修复问题的非破坏性变更
- [ ] 新功能(增加功能的非破坏性变更
- [ ] 破坏性更改(会导致现有功能无法按预期运行的修复或功能
- [ ] 此更改需要更新文档

# 如何进行测试?

请描述您为验证更改而进行的测试。提供说明以便我们能够重现。还请列出测试配置的任何相关细节

- [ ] TODO

# 建议核对表

- 我已对自己的代码进行了自我审查
- 我已对自己的代码进行了注释,尤其是在难以理解的地方
- 我的修改没有产生新的警告
- [ ] `可选的` 我对文档做了相应的修改
- [ ] `可选项` 我添加了测试来证明我的修复是有效的或者我的功能是可行的
- [ ] `可选项` 新的和现有的单元测试在本地通过了我的修改
57 changes: 57 additions & 0 deletions .github/workflows/Build and pack nuget.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Build and pack nuget
on:
push:
tags:
- '[0-9]+(\.[0-9]+)*([-\.]\S+)?' # 触发tag,正则匹配 1.0.0 或 1.0.0-rc.1 或 1.0.0-rc.1+build.1 等

env:
IS_PRODUCTION: true
TAG: ${{ github.ref_name }} # 获取当前分支名或tag名
# TAG: 1.0.0 # 获取当前分支名或tag名
NUGET_SOURCE: https://api.nuget.org/v3/index.json
NUGET_SOURCE_APIKEY: ${{ secrets.NUGET_TOKEN_YOYOBOOT }}

jobs:

build:
runs-on: windows-latest
steps:
# 拉取代码
- uses: actions/checkout@v4
# 配置dotnet环境
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
# 缓存nuget
- name: Cache NuGet packages
uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
${{ runner.os }}-build-nuget-${{ env.CACHE_NAME }}-
# 还原依赖
- name: Restore dependencies
run: dotnet restore
# 以Release形式编译
- name: Build with dotnet
run: dotnet build --configuration Release
# 打包为nupkg
- name: Pack with powershell
shell: pwsh
working-directory: ./nupkg
run: ./pack.ps1
# 推送到nuget.org
- name: Push Nuget Package
working-directory: ./nupkg
run: ./pack_push.ps1
shell: pwsh
# 推送到github nuget
- name: Push to GitHub Nuget Packages
working-directory: ./nupkg
run: ./pack_push.ps1
shell: pwsh
env:
NUGET_SOURCE: https://nuget.pkg.github.com/yoyoboot/index.json
NUGET_SOURCE_APIKEY: ${{ secrets.CICD_PACKAGE_GITHUB_TOKEN }}
27 changes: 0 additions & 27 deletions .github/workflows/build-and-test.yml

This file was deleted.

45 changes: 45 additions & 0 deletions .github/workflows/windows-dotnet-build-and-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# This workflow will build a .NET project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net

name: windows-dotnet-build-and-test

on:
# push:
# branches: [ "main" ]
pull_request:
paths:
- '**/*.cs'
- '**/*.cshtml'
- '**/*.csproj'
- '**/*.razor'

jobs:
build:

runs-on: windows-latest

steps:
# 拉取代码
- uses: actions/checkout@v4
# 配置dotnet环境
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
# 缓存nuget
- name: Cache NuGet packages
uses: actions/cache@v3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
restore-keys: |
${{ runner.os }}-build-nuget-${{ env.CACHE_NAME }}-
# 还原依赖
- name: Restore
run: dotnet restore
# 以默认形式编译
- name: Build
run: dotnet build --no-restore
# 执行单元测试
- name: Test
run: dotnet test --no-build --verbosity normal
1 change: 1 addition & 0 deletions .gitlab/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# .gitlab CI Readme
Loading

0 comments on commit 5ecf9b1

Please sign in to comment.