From 22a980bd815096b37b47f1b1afdea79caf3cdc24 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 7 Jun 2021 11:17:13 +0200 Subject: [PATCH 1/4] remove local changelog settings --- .github_changelog_generator | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .github_changelog_generator diff --git a/.github_changelog_generator b/.github_changelog_generator deleted file mode 100644 index ebf5c16cfd..0000000000 --- a/.github_changelog_generator +++ /dev/null @@ -1,16 +0,0 @@ -pr-wo-labels=False -exclude-labels=duplicate,question,invalid,wontfix,weekly-digest -author=False -unreleased=True -since-tag=3.0.0 -enhancement-label=#### 🚀 Enhancements -bugs-label=#### 🐛 Bug fixes -deprecated-label:#### ⚠️ Deprecations -breaking-label:#### 💥 Breaking -release-branch=main -issues=False -author=False -verbose=True -issues-wo-labels=False -exclude-tags-regex="CI/.+" -max-issues=100 \ No newline at end of file From 3cabcd71ab8e228b39c399416d504eef9894800c Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 7 Jun 2021 11:36:05 +0200 Subject: [PATCH 2/4] authenticate git sooner --- .github/workflows/prerelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 4b25f95275..529c52e82d 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -75,6 +75,7 @@ jobs: run: | git config user.email ${{ secrets.CI_EMAIL }} git config user.name ${{ secrets.CI_USER }} + git remote set-url --push origin https://pypebot:${{ secrets.ADMIN_TOKEN }}@github.com/pypeclub/openpype cd repos/avalon-core git checkout main git pull @@ -83,7 +84,6 @@ jobs: git commit -m "[Automated] Bump version" tag_name="CI/${{ steps.version.outputs.next_tag }}" git tag -a $tag_name -m "nightly build" - git remote set-url --push origin https://pypebot:${{ secrets.ADMIN_TOKEN }}@github.com/pypeclub/openpype git push git push origin $tag_name From 87165239c1dbc11c75ec90b07b64ed6fec42cb8e Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Mon, 7 Jun 2021 11:55:51 +0200 Subject: [PATCH 3/4] use CasperWA/push-protected --- .github/workflows/prerelease.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 529c52e82d..e4fd91e3fd 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -75,7 +75,6 @@ jobs: run: | git config user.email ${{ secrets.CI_EMAIL }} git config user.name ${{ secrets.CI_USER }} - git remote set-url --push origin https://pypebot:${{ secrets.ADMIN_TOKEN }}@github.com/pypeclub/openpype cd repos/avalon-core git checkout main git pull @@ -84,8 +83,14 @@ jobs: git commit -m "[Automated] Bump version" tag_name="CI/${{ steps.version.outputs.next_tag }}" git tag -a $tag_name -m "nightly build" - git push - git push origin $tag_name + + - name: Push to protected main branch + uses: CasperWA/push-protected@v2 + with: + token: ${{ secrets.ADMIN_TOKEN }} + branch: main + tags: true + unprotect_reviews: true - name: 🔨 Merge main back to develop uses: everlytic/branch-merge@1.1.0 From 646239eb25c915235997246e3403e1da83aacebe Mon Sep 17 00:00:00 2001 From: OpenPype Date: Mon, 7 Jun 2021 10:02:22 +0000 Subject: [PATCH 4/4] [Automated] Bump version --- CHANGELOG.md | 23 ++++++++++++++++++++--- openpype/version.py | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 032f876aa3..8fb7866420 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## [3.1.0-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD) + +[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.0.0...HEAD) + +#### 🚀 Enhancements + +- \#1333 - added tooltip hints to Pyblish buttons [\#1649](https://github.com/pypeclub/OpenPype/pull/1649) + +#### 🐛 Bug fixes + +- Fix missing dbm python module [\#1652](https://github.com/pypeclub/OpenPype/pull/1652) +- Transparent branches in view on Mac [\#1648](https://github.com/pypeclub/OpenPype/pull/1648) +- Add asset on task item [\#1646](https://github.com/pypeclub/OpenPype/pull/1646) +- Project manager save and queue [\#1645](https://github.com/pypeclub/OpenPype/pull/1645) +- New project anatomy values [\#1644](https://github.com/pypeclub/OpenPype/pull/1644) + +# Changelog + ## [3.0.0](https://github.com/pypeclub/openpype/tree/3.0.0) @@ -1565,10 +1583,9 @@ A large cleanup release. Most of the change are under the hood. - _(avalon)_ subsets in maya 2019 weren't behaving correctly in the outliner -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* + + diff --git a/openpype/version.py b/openpype/version.py index 6bcc8dcfb8..24ceaccea9 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.0.0" +__version__ = "3.1.0-nightly.1"