diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index ca3711b..5b56a69 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -6,10 +6,6 @@ on: branches: - main -permissions: - contents: write - pull-requests: write - concurrency: group: ${{ github.workflow }} cancel-in-progress: true @@ -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 "") @@ -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 @@ -111,3 +111,4 @@ jobs: uses: benc-uk/workflow-dispatch@v1 with: workflow: "Publish and release CumulusCI_AzureDevOps" + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/cumulusci_ado/__about__.py b/cumulusci_ado/__about__.py index 6526deb..a73339b 100644 --- a/cumulusci_ado/__about__.py +++ b/cumulusci_ado/__about__.py @@ -1 +1 @@ -__version__ = "0.0.7" +__version__ = "0.0.8" diff --git a/cumulusci_ado/vcs/ado/dependencies/ado_dependencies.py b/cumulusci_ado/vcs/ado/dependencies/ado_dependencies.py index 02a3dab..3e3a62b 100644 --- a/cumulusci_ado/vcs/ado/dependencies/ado_dependencies.py +++ b/cumulusci_ado/vcs/ado/dependencies/ado_dependencies.py @@ -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