diff --git a/.github/ISSUE_TEMPLATE/----.md b/.github/ISSUE_TEMPLATE/----.md new file mode 100644 index 00000000..b407e8a2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/----.md @@ -0,0 +1,10 @@ +--- +name: 需求建议 +about: 提出针对本项目的想法和建议 +title: "[Feature] " +labels: 类型:需求 +assignees: ibuler + +--- + +**请描述您的需求或者改进建议.** diff --git a/.github/ISSUE_TEMPLATE/bug---.md b/.github/ISSUE_TEMPLATE/bug---.md new file mode 100644 index 00000000..d668e006 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug---.md @@ -0,0 +1,22 @@ +--- +name: Bug 提交 +about: 提交产品缺陷帮助我们更好的改进 +title: "[Bug] " +labels: 类型:bug +assignees: wojiushixiaobai + +--- + +**JumpServer 版本(v1.5.9以下不再支持)** + + +**浏览器版本** + + +**Bug 描述** + + +**Bug 重现步骤(有截图更好)** +1. +2. +3. diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 00000000..1dd2a68d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,10 @@ +--- +name: 问题咨询 +about: 提出针对本项目安装部署、使用及其他方面的相关问题 +title: "[Question] " +labels: 类型:提问 +assignees: wojiushixiaobai + +--- + +**请描述您的问题.** diff --git a/.github/release-config.yml b/.github/release-config.yml new file mode 100644 index 00000000..1a75bdf6 --- /dev/null +++ b/.github/release-config.yml @@ -0,0 +1,44 @@ +name-template: 'v$RESOLVED_VERSION' +tag-template: 'v$RESOLVED_VERSION' +categories: + - title: '🌱 新功能 Features' + labels: + - 'feature' + - 'enhancement' + - 'feat' + - '新功能' + - title: '🚀 性能优化 Optimization' + labels: + - 'perf' + - 'opt' + - 'refactor' + - 'Optimization' + - '优化' + - title: '🐛 Bug修复 Bug Fixes' + labels: + - 'fix' + - 'bugfix' + - 'bug' + - title: '🧰 其它 Maintenance' + labels: + - 'chore' + - 'docs' +exclude-labels: + - 'no' + - '无需处理' + - 'wontfix' +change-template: '- $TITLE @$AUTHOR (#$NUMBER)' +version-resolver: + major: + labels: + - 'major' + minor: + labels: + - 'minor' + patch: + labels: + - 'patch' + default: patch +template: | + ## 版本变化 What’s Changed + $CHANGES \ No newline at end of file diff --git a/.github/workflows/jms-generic-action-handler.yml b/.github/workflows/jms-generic-action-handler.yml new file mode 100644 index 00000000..3f499cfb --- /dev/null +++ b/.github/workflows/jms-generic-action-handler.yml @@ -0,0 +1,12 @@ +on: [push, pull_request, release] + +name: JumpServer repos generic handler + +jobs: + generic_handler: + name: Run generic handler + runs-on: ubuntu-latest + steps: + - uses: jumpserver/action-generic-handler@master + env: + GITHUB_TOKEN: ${{ secrets.PRIVATE_TOKEN }} diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml new file mode 100644 index 00000000..e50aae83 --- /dev/null +++ b/.github/workflows/release-drafter.yml @@ -0,0 +1,46 @@ +on: + push: + # Sequence of patterns matched against refs/tags + tags: + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + +name: Create Release And Upload assets + +jobs: + create-realese: + name: Create Release + runs-on: ubuntu-latest + outputs: + upload_url: ${{ steps.create_release.outputs.upload_url }} + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Get version + id: get_version + run: | + TAG=$(basename ${GITHUB_REF}) + VERSION=${TAG/v/} + echo "::set-output name=TAG::$TAG" + echo "::set-output name=VERSION::$VERSION" + - name: Create Release + id: create_release + uses: release-drafter/release-drafter@v5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + config-name: release-config.yml + version: ${{ steps.get_version.outputs.TAG }} + tag: ${{ steps.get_version.outputs.TAG }} + + build-and-release: + needs: create-realese + name: Build and Release + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Build it and upload + uses: jumpserver/action-build-upload-assets@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ needs.create-realese.outputs.upload_url }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 67d322a0..a9d12f60 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ cofnig.link .env .bak config.link +release/* diff --git a/utils/build.sh b/utils/build.sh new file mode 100755 index 00000000..cdeb9875 --- /dev/null +++ b/utils/build.sh @@ -0,0 +1,34 @@ +#!/bin/bash -i +# +# 该build基于registry.fit2cloud.com/public/python:3 +utils_dir=$(pwd) +project_dir=$(dirname "$utils_dir") +release_dir=${project_dir}/release + +# 打开alias +shopt -s expand_aliases +# 打包 +cd "${project_dir}" || exit 3 +rm -rf "${release_dir:?}"/* +to_dir="${release_dir}/jumpserver-installer" +mkdir -p "${to_dir}" + +if [[ -d '.git' ]];then + command -v git || yum -y install git + git archive --format tar HEAD | tar x -C "${to_dir}" +else + cp -R . /tmp/jumpserver + mv /tmp/jumpserver/* "${to_dir}" +fi + +if [[ $(uname) == 'Darwin' ]];then + alias sedi='sed -i ""' +else + alias sedi='sed -i' +fi + +# 修改版本号文件 +if [[ -n ${VERSION} ]]; then + sedi "s@VERSION=.*@VERSION=\"${VERSION}\"@g" "${to_dir}/static.env" +fi +