Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
branches:
- main

permissions:
contents: write
pull-requests: write

concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true
Expand Down Expand Up @@ -60,6 +56,8 @@ jobs:
- name: Generate release notes
if: steps.version.outputs.level == 'major' || steps.version.outputs.level == 'minor' || steps.version.outputs.level == 'patch' || steps.version.outputs.level == 'beta'
id: changelog
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
# This will be empty if there are no releases yet
PREVIOUS_VERSION=$(gh release view --json tagName --jq .tagName 2>/dev/null || echo "")
Expand Down Expand Up @@ -97,6 +95,8 @@ jobs:
# Push the new branch.
git push origin "$BRANCH_NAME"
- name: Create and Merge Release PR
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
PR_URL=$(gh pr create --title "Release v$(hatch version)" --fill --label 'auto-pr')
if [ -n "$PR_URL" ]; then
Expand All @@ -111,3 +111,4 @@ jobs:
uses: benc-uk/workflow-dispatch@v1
with:
workflow: "Publish and release CumulusCI_AzureDevOps"
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion cumulusci_ado/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.0.7"
__version__ = "0.0.8"
3 changes: 1 addition & 2 deletions cumulusci_ado/vcs/ado/dependencies/ado_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
from cumulusci.core.exceptions import DependencyResolutionError
from cumulusci.core.utils import deep_merge_plugins
from cumulusci.vcs.bootstrap import get_remote_project_config
from pydantic import root_validator
from pydantic.networks import AnyUrl
from pydantic.v1 import AnyUrl, root_validator

from cumulusci_ado.utils.ado import parse_repo_url
from cumulusci_ado.vcs.ado.adapter import ADORepository
Expand Down
Loading