diff --git a/.github/workflows/build_and_upload_package.yaml b/.github/workflows/build_and_upload_package.yaml index 27b7ee5..78efbc6 100644 --- a/.github/workflows/build_and_upload_package.yaml +++ b/.github/workflows/build_and_upload_package.yaml @@ -3,8 +3,26 @@ name: Build DongTai Core Package and push to Ali OSS on: pull_request: branches: [ main ] + paths-ignore: + - '.github/**' + - 'changes/**' + - 'deploy/**' + - '**.md' + - '**.yml' + - '**.xml' + - 'LICENSE' + - '.gitignore' push: branches: [ main ] + paths-ignore: + - '.github/**' + - 'changes/**' + - 'deploy/**' + - '**.md' + - '**.yml' + - '**.xml' + - 'LICENSE' + - '.gitignore' jobs: build: if: ${{ github.event_name == 'push' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a5adef..46d1c85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,14 @@ name: Build DongTai Core Package and push to Ali OSS on: - push: - branches: [ "release-*" ] + release: + types: [ created, edited ] jobs: build: runs-on: ubuntu-latest + permissions: + contents: write strategy: max-parallel: 4 @@ -22,25 +24,26 @@ jobs: - id: release run: | - VERSION=`echo ${GITHUB_REF##*/} | awk -F'-' '{print $2}'` - echo "::set-output name=VERSION::$VERSION" - - - name: Get release version - id: get_release_version - run: | - V=`echo ${{ steps.release.outputs.VERSION }} | sed -e's/v//g' | sed -e's/V//g'`; \ - echo ::set-output name=VERSION::${V} + TAG_NAME=${{ github.event.release.tag_name }} + ID=`echo ${TAG_NAME##v}` + echo "::set-output name=VERSION::$ID" - name: Generate version file run: | cd ${{ github.workspace }} && \ - echo "${{ github.event.repository.name }},version,${{ steps.get_release_version.outputs.VERSION }}" >> version.txt && \ + echo "${{ github.event.repository.name }},version,${{ steps.release.outputs.VERSION }}" >> version.txt && \ echo "${{ github.event.repository.name }},commit_hash,${GITHUB_SHA}" >> version.txt \ - name: Replace setup cfg run: | - sed -i -e 's/version = .*$/version = ${{ steps.get_release_version.outputs.VERSION }}/g' setup.cfg + git config --global user.name 'exexute' + git config --global user.email '1528360120@qq.com' + git checkout -b "release-${{ steps.release.outputs.VERSION }}" + sed -i -e 's/version = .*$/version = ${{ steps.release.outputs.VERSION }}/g' setup.cfg cat setup.cfg + git add . + git commit -m "Update: change version to $NEW_VERSION" + git push "https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git" HEAD:"release-$NEW_VERSION" - name: Build DongTai Core Package run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index bb1fc44..3387797 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## [1.1.4](https://github.com/HXSecurity/DongTai-openapi/releases/tag/v1.1.4)-2021-12-18 +* Function + * Increase hard-coded vulnerabilities + ## [1.1.3](https://github.com/HXSecurity/dongtai-core/releases/tag/v1.1.3)-2021-12-03 * Function diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md index e3665d3..e5962b3 100644 --- a/CHANGELOG_CN.md +++ b/CHANGELOG_CN.md @@ -1,5 +1,9 @@ # 升级日志 +## [1.1.4](https://github.com/HXSecurity/DongTai-openapi/releases/tag/v1.1.4) - 2021-12-18 +* 功能 + * 增加硬编码漏洞 + ## [1.1.3](https://github.com/HXSecurity/dongtai-core/releases/tag/v1.1.3)-2021-12-03 * 功能