diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 072f9fb2..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -version: 2 -updates: - - package-ecosystem: github-actions - directories: [/, actions/**/*] - schedule: - interval: weekly - groups: - gh-actions-dependencies: - patterns: ['*'] - labels: [gh-actions, dependencies] - commit-message: - prefix: gh-actions - include: scope - - package-ecosystem: pip - directories: [/, actions/**/*] - schedule: - interval: weekly - versioning-strategy: increase-if-necessary - groups: - python-dependencies: - patterns: ['*'] - labels: [python, dependencies] - commit-message: - prefix: python-deps - include: scope diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 00000000..c2bf0039 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,77 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "dependencyDashboard": true, + "extends": [ + "config:best-practices" + ], + "ignoreDeps": [ + "tektronix/python-package-ci-cd" + ], + "ignorePaths": [ + "**/requirements.txt" + ], + "packageRules": [ + { + "addLabels": [ + "docker", + "dependencies" + ], + "additionalBranchPrefix": "docker-deps/", + "description": "Add docker and dependencies labels to Docker dependency updates", + "matchManagers": [ + "dockerfile" + ], + "semanticCommitScope": "docker-deps" + }, + { + "addLabels": [ + "gh-actions", + "dependencies" + ], + "additionalBranchPrefix": "gh-actions-deps/", + "description": "Add gh-actions and dependencies labels to GitHub Action dependency updates", + "matchManagers": [ + "github-actions" + ], + "semanticCommitScope": "gh-actions-deps" + }, + { + "addLabels": [ + "python", + "dependencies" + ], + "additionalBranchPrefix": "python-deps/", + "description": "Add python and dependencies labels to Python dependency updates", + "matchManagers": [ + "poetry", + "pip_requirements" + ], + "semanticCommitScope": "python-deps" + }, + { + "description": "Group together all python-semantic-release dependencies", + "groupName": "python-semantic-release dependencies", + "matchPackagePatterns": [ + "^python-semantic-release*" + ] + }, + { + "commitMessageSuffix": " for the {{depTypes}} group(s)", + "description": "Add commit suffix for the dependency group in pyproject.toml", + "matchDepTypes": [ + "*" + ], + "matchFileNames": [ + "pyproject.toml" + ], + "matchManagers": [ + "poetry" + ], + "matchPackageNames": [ + "*" + ] + } + ], + "platformCommit": "enabled", + "prHourlyLimit": 5 +} diff --git a/.github/workflows/_reusable-enforce-community-standards.yml b/.github/workflows/_reusable-enforce-community-standards.yml index f8bc70af..7eb92756 100644 --- a/.github/workflows/_reusable-enforce-community-standards.yml +++ b/.github/workflows/_reusable-enforce-community-standards.yml @@ -18,7 +18,7 @@ jobs: - .github/ISSUE_TEMPLATE/bug_report.@(yml|yaml) - .github/ISSUE_TEMPLATE/feature_request.@(yml|yaml) - .github/PULL_REQUEST_TEMPLATE.md - - .github/dependabot.@(yml|yaml) + - .github/@(dependabot.@(yml|yaml)|renovate.json) - .github/workflows/codeql-analysis.@(yml|yaml) steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 diff --git a/.github/workflows/_reusable-sbom-scan.yml b/.github/workflows/_reusable-sbom-scan.yml index bdd1dc53..d26608ad 100644 --- a/.github/workflows/_reusable-sbom-scan.yml +++ b/.github/workflows/_reusable-sbom-scan.yml @@ -24,7 +24,7 @@ jobs: with: format: spdx-json output-file: ${{ github.event.repository.name }}-sbom.spdx.json - - uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 + - uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2 if: ${{ !(github.event.pull_request.head.repo.fork || github.event.workflow_call.pull_request.head.repo.fork) && github.actor != 'dependabot[bot]' }} with: subject-path: ${{ github.event.repository.name }}-sbom.spdx.json diff --git a/.github/workflows/_reusable-test-docs.yml b/.github/workflows/_reusable-test-docs.yml index 17cc62f2..9fe2cefd 100644 --- a/.github/workflows/_reusable-test-docs.yml +++ b/.github/workflows/_reusable-test-docs.yml @@ -44,12 +44,11 @@ jobs: run: python -m pip install tox - name: Test run: tox -ve ${{ matrix.tox-env }} - - uses: thedoctor0/zip-release@b57d897cb5d60cb78b51a507f63fa184cfe35554 # v0.7.6 + - uses: vimtor/action-zip@1379ea20d4c5705669ba81fd626dd01b1c738f26 # v1.2 if: ${{ !cancelled() }} with: - type: zip - filename: ${{ matrix.tox-env }}_results.zip - path: .results_${{ matrix.tox-env }}/ + dest: ${{ matrix.tox-env }}_results.zip + files: .results_${{ matrix.tox-env }}/ - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 if: ${{ !cancelled() }} with: diff --git a/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml b/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml index 647db2e0..4bde1aad 100644 --- a/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml +++ b/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml @@ -62,7 +62,6 @@ jobs: update-python-and-pre-commit-deps: name: Update python linters and pre-commit dependencies runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' && contains(github.head_ref, '/pip/') }} permissions: contents: write steps: @@ -102,7 +101,7 @@ jobs: export-dependency-groups: ${{ inputs.export-dependency-groups }} - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1 with: - commit_message: 'chore: Update python linters and pre-commit dependencies.' + commit_message: 'chore: Update dependencies.' commit_user_name: ${{ inputs.commit-user-name }} commit_user_email: ${{ inputs.commit-user-email }} commit_author: ${{ inputs.commit-user-name }} <${{ inputs.commit-user-email }}> diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d7925aae..294abd5f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -3,6 +3,7 @@ name: CodeQL on: push: branches: [main] + merge_group: pull_request: branches: [main] schedule: diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 8a23098e..8f5d6671 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -1,6 +1,7 @@ --- name: Pull Request Dependency Review on: + merge_group: pull_request: branches: [main] permissions: @@ -11,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c + - uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4 with: fail-on-severity: low comment-summary-in-pr: on-failure diff --git a/.github/workflows/enforce-community-standards.yml b/.github/workflows/enforce-community-standards.yml index 942819a2..4f4466ee 100644 --- a/.github/workflows/enforce-community-standards.yml +++ b/.github/workflows/enforce-community-standards.yml @@ -3,6 +3,7 @@ name: Enforce Open Source Community Standards on: push: branches: [main] + merge_group: pull_request: branches: [main] jobs: diff --git a/.github/workflows/sbom-scan.yml b/.github/workflows/sbom-scan.yml index 11535713..7a4f1ae7 100644 --- a/.github/workflows/sbom-scan.yml +++ b/.github/workflows/sbom-scan.yml @@ -3,6 +3,7 @@ name: Create & Scan SBOM on: push: branches: [main] + merge_group: pull_request: branches: [main] release: diff --git a/.github/workflows/test-actions.yml b/.github/workflows/test-actions.yml index 6c6a6c97..8d556db3 100644 --- a/.github/workflows/test-actions.yml +++ b/.github/workflows/test-actions.yml @@ -3,6 +3,7 @@ name: Test repository Actions on: push: branches: [main] + merge_group: pull_request: branches: [main] # Cancel running jobs for the same workflow and branch. @@ -52,7 +53,7 @@ jobs: previous-changelog-filepath: python_semantic_release_templates/.testing_previous_changelog_for_template.md previous-release-notes-filepath: python_semantic_release_templates/.testing_previous_release_notes_for_template.md - name: Get Job Summary - uses: austenstone/job-summary@67b7e1f68ee55e44d073ab7354e7b580cd09567c + uses: austenstone/job-summary@67b7e1f68ee55e44d073ab7354e7b580cd09567c # v2.0 id: job-summary with: name: temp_job_summary @@ -124,8 +125,10 @@ jobs: update-pre-commit: true run-pre-commit: true dependency-dict: '{"dev": ["pyright"]}' - pre-commit-hook-skip-list: remove-tabs,forbid-tabs,check-readthedocs,check-dependabot,check-github-actions,check-github-workflows,commitizen,blacken-docs,yamlfix,hadolint,mdformat,markdown-link-check,check-poetry,toml-sort-fix,pyright,poetry-audit,ruff,ruff-format,docformatter - export-dependency-groups: udd:actions/update_development_dependencies,cutv:actions/create_unique_testpypi_version,fci:actions/find_unreleased_changelog_items,tests + pre-commit-hook-skip-list: remove-tabs,forbid-tabs,check-readthedocs,check-dependabot,check-github-actions,check-github-workflows,commitizen,blacken-docs,yamlfix,hadolint,mdformat,markdown-link-check,check-poetry,toml-sort-fix,pyright,poetry-audit,ruff,ruff-format,docformatter,renovate-config-validator + export-dependency-groups: | + update_development_dependencies:actions/update_development_dependencies, + tests test-fetch_pr_number: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test-code.yml b/.github/workflows/test-code.yml index 14d4250f..45ea7376 100644 --- a/.github/workflows/test-code.yml +++ b/.github/workflows/test-code.yml @@ -3,6 +3,7 @@ name: Test code on: push: branches: [main] + merge_group: pull_request: branches: [main] # Cancel running jobs for the same workflow and branch. diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml index 1685aedb..23a4902b 100644 --- a/.github/workflows/test-docs.yml +++ b/.github/workflows/test-docs.yml @@ -3,6 +3,7 @@ name: Test docs on: push: branches: [main] + merge_group: pull_request: branches: [main] concurrency: diff --git a/.github/workflows/update-python-and-pre-commit-dependencies.yml b/.github/workflows/update-python-and-pre-commit-dependencies.yml deleted file mode 100644 index 8b100551..00000000 --- a/.github/workflows/update-python-and-pre-commit-dependencies.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: Update python linting dependencies in-sync with pre-commit -on: - pull_request: - branches: [main] -jobs: - update-python-and-pre-commit-deps: - uses: ./.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml - with: - commit-user-name: ${{ vars.TEK_OPENSOURCE_NAME }} - commit-user-email: ${{ vars.TEK_OPENSOURCE_EMAIL }} - dependency-dict: '{"dev": ["pyright"]}' - update-pre-commit: true - run-pre-commit: true - pre-commit-hook-skip-list: pyright,poetry-audit - export-dependency-groups: udd:actions/update_development_dependencies,cutv:actions/create_unique_testpypi_version,fci:actions/find_unreleased_changelog_items,tests,docs:doc_config - permissions: - contents: write - secrets: - checkout-token: ${{ secrets.TEK_OPENSOURCE_TOKEN }} - gpg-signing-key-private: ${{ secrets.TEK_OPENSOURCE_GPG_SIGNING_KEY_PRIVATE }} - gpg-signing-key-passphrase: ${{ secrets.TEK_OPENSOURCE_GPG_SIGNING_KEY_PASSPHRASE }} diff --git a/.github/workflows/update-python-dependencies.yml b/.github/workflows/update-python-dependencies.yml new file mode 100644 index 00000000..b77beb78 --- /dev/null +++ b/.github/workflows/update-python-dependencies.yml @@ -0,0 +1,54 @@ +--- +name: Update python dependencies +on: + merge_group: + pull_request: + branches: [main] +jobs: + determine-dependency-groups: + if: ${{ github.actor == 'renovate[bot]' && contains(github.head_ref, '/python-deps/') }} + runs-on: ubuntu-latest + outputs: + export-groups: ${{ steps.set-output.outputs.export-groups }} + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: Get commit message + id: get-commit-message + run: | + commit_message="$(git log -1 --pretty=%B)" + echo "commit-message=$commit_message" >> "$GITHUB_OUTPUT" + - name: Determine the groups that will need to be exported + id: set-output + run: | + commit_message="${{ steps.get-commit-message.outputs.commit-message }}" + export_groups="" + if [[ "$commit_message" == *"update_development_dependencies"* ]]; then + export_groups+="update_development_dependencies:actions/update_development_dependencies," + fi + if [[ "$commit_message" == *"create_unique_testpypi_version"* ]]; then + export_groups+="create_unique_testpypi_version:actions/create_unique_testpypi_version," + fi + if [[ "$commit_message" == *"find_unreleased_changelog_items"* ]]; then + export_groups+="find_unreleased_changelog_items:actions/find_unreleased_changelog_items," + fi + if [[ "$commit_message" == *"tests"* ]]; then + export_groups+="tests," + fi + if [[ "$commit_message" == *"docs"* ]]; then + export_groups+="docs:doc_config," + fi + echo "export-groups=$export_groups" >> "$GITHUB_OUTPUT" + update-python-and-pre-commit-deps: + if: ${{ github.actor == 'renovate[bot]' && contains(github.head_ref, '/python-deps/') }} + needs: determine-dependency-groups + uses: ./.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml + with: + commit-user-name: ${{ vars.TEK_OPENSOURCE_NAME }} + commit-user-email: ${{ vars.TEK_OPENSOURCE_EMAIL }} + export-dependency-groups: ${{ needs.determine-dependency-groups.outputs.export-groups }} + permissions: + contents: write + secrets: + checkout-token: ${{ secrets.TEK_OPENSOURCE_TOKEN }} + gpg-signing-key-private: ${{ secrets.TEK_OPENSOURCE_GPG_SIGNING_KEY_PRIVATE }} + gpg-signing-key-passphrase: ${{ secrets.TEK_OPENSOURCE_GPG_SIGNING_KEY_PASSPHRASE }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bb19dcfa..6ab8fe81 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_install_hook_types: [pre-commit, commit-msg] default_stages: [pre-commit] ci: autofix_prs: false - autoupdate_schedule: quarterly + autoupdate_schedule: weekly skip: [check-poetry, pyright, poetry-audit, markdown-link-check] repos: - repo: https://github.com/pre-commit/pre-commit-hooks @@ -32,6 +32,10 @@ repos: hooks: - id: remove-tabs - id: forbid-tabs + - repo: https://github.com/renovatebot/pre-commit-hooks + rev: 5b7fd349cf98e23c7d57839c7883f378d994d831 # frozen: 38.64.2 + hooks: + - id: renovate-config-validator - repo: https://github.com/python-jsonschema/check-jsonschema rev: 5c70e3d884fdbe99af42f2714a444e39f321498d # frozen: 0.29.2 hooks: @@ -118,7 +122,7 @@ repos: always_run: true args: [audit, --json, --ignore-code=CVE-2019-8341] - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 24d039e647a08707e6cb31e75e01844eeff925e7 # frozen: v0.6.2 + rev: f1ebc5730d98440041cc43e4d69829ad598ae1e7 # frozen: v0.6.3 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bc9583d..f44d77b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,15 @@ Valid subsections within a version are: Things to be included in the next release go here. +### Added + +- Added the ability for the `update_development_dependencies` action to accept a comma-separated, multiline string + +### Changed + +- Changed the `_reusable-update-python-and-pre-commit-dependencies.yml` workflow to no longer only work on PRs from Dependabot, users will now need to apply any conditional login in the calling workflow. +- Updated the `_reusable-update-python-and-pre-commit-dependencies.yml` workflow to allow using [`renovate`](https://docs.renovatebot.com/) instead of Dependabot to update dependencies. + --- ## v1.2.0 (2024-08-30) diff --git a/actions/create_unique_testpypi_version/requirements.txt b/actions/create_unique_testpypi_version/requirements.txt index 20140be4..3bff657e 100644 --- a/actions/create_unique_testpypi_version/requirements.txt +++ b/actions/create_unique_testpypi_version/requirements.txt @@ -9,7 +9,7 @@ packaging==24.1 ; python_version >= "3.12" and python_version < "3.13" poetry-core==1.9.0 ; python_version >= "3.12" and python_version < "3.13" pydantic==2.8.2 ; python_version >= "3.12" and python_version < "3.13" pydantic-core==2.20.1 ; python_version >= "3.12" and python_version < "3.13" -pypi-simple==1.6.0 ; python_version >= "3.12" and python_version < "3.13" +pypi-simple==1.5.0 ; python_version >= "3.12" and python_version < "3.13" requests==2.32.3 ; python_version >= "3.12" and python_version < "3.13" soupsieve==2.6 ; python_version >= "3.12" and python_version < "3.13" tomli==2.0.1 ; python_version >= "3.12" and python_version < "3.13" diff --git a/actions/update_development_dependencies/main.py b/actions/update_development_dependencies/main.py index 9c1e157a..a31c06b9 100644 --- a/actions/update_development_dependencies/main.py +++ b/actions/update_development_dependencies/main.py @@ -192,7 +192,7 @@ def main() -> None: repo_root = os.environ["INPUT_REPO-ROOT"] dependency_dict = convert_dict_input(os.environ["INPUT_DEPENDENCY-DICT"]) export_dependency_groups = [ - x for x in os.environ["INPUT_EXPORT-DEPENDENCY-GROUPS"].split(",") if x + x.strip() for x in os.environ["INPUT_EXPORT-DEPENDENCY-GROUPS"].split(",") if x ] pre_commit_hook_skip_list = os.environ["INPUT_PRE-COMMIT-HOOK-SKIP-LIST"] install_dependencies = os.environ["INPUT_INSTALL-DEPENDENCIES"].lower() in _ENV_VAR_TRUE_VALUES diff --git a/actions/update_development_dependencies/requirements.txt b/actions/update_development_dependencies/requirements.txt index 14caf44c..8dbc3290 100644 --- a/actions/update_development_dependencies/requirements.txt +++ b/actions/update_development_dependencies/requirements.txt @@ -40,7 +40,7 @@ ptyprocess==0.7.0 ; python_version >= "3.12" and python_version < "3.13" pycparser==2.22 ; python_version >= "3.12" and python_version < "3.13" and (sys_platform == "darwin" or sys_platform == "linux") and (sys_platform == "darwin" or platform_python_implementation != "PyPy") pydantic==2.8.2 ; python_version >= "3.12" and python_version < "3.13" pydantic-core==2.20.1 ; python_version >= "3.12" and python_version < "3.13" -pypi-simple==1.6.0 ; python_version >= "3.12" and python_version < "3.13" +pypi-simple==1.5.0 ; python_version >= "3.12" and python_version < "3.13" pyproject-hooks==1.1.0 ; python_version >= "3.12" and python_version < "3.13" pywin32-ctypes==0.2.3 ; python_version >= "3.12" and python_version < "3.13" and sys_platform == "win32" pyyaml==6.0.2 ; python_version >= "3.12" and python_version < "3.13" diff --git a/doc_config/known_words.txt b/doc_config/known_words.txt index 5154a9e7..8d5f7b78 100644 --- a/doc_config/known_words.txt +++ b/doc_config/known_words.txt @@ -40,6 +40,7 @@ sublicense tektronix testpypi update_development_dependencies +vimtor white_check_mark www yaml diff --git a/pyproject.toml b/pyproject.toml index 96e4140c..a5abb8a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,20 +32,18 @@ version = "1.2.0" [tool.poetry.dependencies] python = "~3.12" # This needs to stay in sync with all CI workflows -[tool.poetry.group.cutv.dependencies] # dependencies for actions/create_unique_testpypi_version -poetry-core = "^1.9.0" -pypi-simple = "^1.6.0" -tomli = "^2.0.1" -tomli-w = "^1.0.0" +[tool.poetry.group.create_unique_testpypi_version.dependencies] +poetry-core = "1.9.0" +pypi-simple = "1.5.0" +tomli = "2.0.0" +tomli-w = "1.0.0" [tool.poetry.group.dev.dependencies] -mkdocs-simple-plugin = "^3.2.0" pip = "^24.0" poetry-audit-plugin = "^0.4.0" poetry-pre-commit-plugin = "^0.1.2" pre-commit = "^3.8.0" pyright = "1.1.378" -python-semantic-release = "^9.8.7" tox = "^4.18.0" tox-gh-actions = "^3.2.0" @@ -57,13 +55,12 @@ mkdocs-macros-plugin = "^1.0.5" mkdocs-mermaid2-plugin = "^1.1.1" mkdocs-same-dir = "^0.1.3" mkdocs-spellcheck = "^1.1.0" -nodeenv = "^1.9.1" pygments = "^2.17.2" pymdown-extensions = "^10.8.1" symspellpy = "^6.7.7" -tomli = "^2.0.1" +tomli = "^2.0.0" -[tool.poetry.group.fci.dependencies] # dependencies for actions/find_unreleased_changelog_items +[tool.poetry.group.find_unreleased_changelog_items.dependencies] [tool.poetry.group.tests.dependencies] coverage = "^7.5.0" @@ -76,13 +73,12 @@ pytest-github-report = "^0.0.1" pytest-html = "^4.1.1" pytest-order = "^1.2.1" -[tool.poetry.group.udd.dependencies] # dependencies for actions/update_development_dependencies -poetry = "^1.8.0" -poetry-plugin-export = "^1.7.1" -pre-commit = "^3.7" -pypi-simple = "^1.6.0" -toml-sort = "^0.23.1" -yamlfix = "^1.17.0" +[tool.poetry.group.update_development_dependencies.dependencies] +poetry-plugin-export = "1.7.1" +pre-commit = "3.8.0" +pypi-simple = "1.5.0" +toml-sort = "0.23.1" +yamlfix = "1.17.0" [tool.pyright] ignore = [ diff --git a/workflows/enforce-community-standards.md b/workflows/enforce-community-standards.md index eeb28196..b5bbc0ad 100644 --- a/workflows/enforce-community-standards.md +++ b/workflows/enforce-community-standards.md @@ -17,7 +17,7 @@ The full list of files that this workflow checks for is as follows: - `.github/ISSUE_TEMPLATE/bug_report.@(yml|yaml)` - `.github/ISSUE_TEMPLATE/feature_request.@(yml|yaml)` - `.github/PULL_REQUEST_TEMPLATE.md` -- `.github/dependabot.@(yml|yaml)` +- `.github/@(dependabot.@(yml|yaml)|renovate.json)` - `.github/workflows/codeql-analysis.@(yml|yaml)` > [!NOTE] diff --git a/workflows/test-docs.md b/workflows/test-docs.md index e625d056..3c13fd5e 100644 --- a/workflows/test-docs.md +++ b/workflows/test-docs.md @@ -57,7 +57,7 @@ commands = > - [actions/checkout](https://github.com/actions/checkout) > - [actions/setup-node](https://github.com/actions/setup-node) > - [actions/setup-python](https://github.com/actions/setup-python) -> - [thedoctor0/zip-release](https://github.com/thedoctor0/zip-release) +> - [vimtor/action-zip](https://github.com/vimtor/action-zip) > - [actions/upload-artifact](https://github.com/actions/upload-artifact) > - [re-actors/alls-green](https://github.com/re-actors/alls-green) > diff --git a/workflows/update-python-and-pre-commit-dependencies.md b/workflows/update-python-and-pre-commit-dependencies.md index 3aadd6e1..c9278b3a 100644 --- a/workflows/update-python-and-pre-commit-dependencies.md +++ b/workflows/update-python-and-pre-commit-dependencies.md @@ -56,6 +56,7 @@ on: branches: [main] jobs: update-python-and-pre-commit-dependencies: + if: ${{ github.actor == 'dependabot[bot]' && contains(github.head_ref, '/pip/') }} # Only run the job for Dependabot PRs uses: tektronix/python-package-ci-cd/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml@v1.2.0 with: commit-user-name: 'User Name'