Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use branch_name_extension and auto-merge dependency PRs #369

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Use branch_name_extension and auto-merge dependency PRs #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7b551e
Bump SINTEF/ci-cd from 2.5.2 to 2.5.3 (#368)
dependabot[bot] Oct 26, 2023
43333cc
Use branch_name_extension for CI update deps
CasperWA Oct 26, 2023
659081e
Automatically merge CI - check dependencies PRs
CasperWA Oct 26, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/cd_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
publish:
name: External
uses: SINTEF/ci-cd/.github/workflows/[email protected].2
uses: SINTEF/ci-cd/.github/workflows/[email protected].3
if: github.repository == 'EMMC-ASBL/oteapi-core' && startsWith(github.ref, 'refs/tags/v')
with:
# General
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci_automerge_dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: CI - Activate auto-merging for Dependabot PRs

on:
pull_request_target:
branches: [ci/dependabot-updates]
branches: [ci/dependabot-updates, release/pydantic-v1-support]

jobs:
update-dependabot-branch:
name: External
uses: SINTEF/ci-cd/.github/workflows/[email protected].2
if: github.repository_owner == 'EMMC-ASBL' && startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]'
uses: SINTEF/ci-cd/.github/workflows/[email protected].3
if: github.repository_owner == 'EMMC-ASBL' && ( ( startsWith(github.event.pull_request.head.ref, 'dependabot/') && github.actor == 'dependabot[bot]' ) || ( startsWith(github.event.pull_request.head.ref, 'ci/update-pyproject') && github.actor == 'TEAM4-0' ) )
secrets:
PAT: ${{ secrets.RELEASE_PAT }}
2 changes: 1 addition & 1 deletion .github/workflows/ci_cd_updated_master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
updates-to-master:
name: External
uses: SINTEF/ci-cd/.github/workflows/[email protected].2
uses: SINTEF/ci-cd/.github/workflows/[email protected].3
if: github.repository_owner == 'EMMC-ASBL'
with:
# General
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/ci_check_dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:
jobs:
check-dependencies:
name: External
uses: SINTEF/ci-cd/.github/workflows/[email protected].2
uses: SINTEF/ci-cd/.github/workflows/[email protected].3
# Job Execution Criteria:
# - It must be executed within the "origin" repository (EMMC-ASBL).
# - Always run for scheduled events.
Expand Down Expand Up @@ -63,8 +63,8 @@ jobs:
PAT: ${{ secrets.RELEASE_PAT }}

check-dependencies-release_pydantic-v1-support:
name: External
uses: SINTEF/ci-cd/.github/workflows/[email protected].2
name: External (pydantic v1 support)
uses: SINTEF/ci-cd/.github/workflows/[email protected].3
# Job Execution Criteria:
# - It must be executed within the "origin" repository (EMMC-ASBL).
# - Always run for scheduled events.
Expand All @@ -89,5 +89,6 @@ jobs:
dependency-name=pydantic...versions=>=2
dependency-name=requests...versions=>=3
dependency-name=urllib3
branch_name_extension: "release/pydantic-v1-support"
secrets:
PAT: ${{ secrets.RELEASE_PAT }}
2 changes: 1 addition & 1 deletion .github/workflows/ci_dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
create-collected-pr:
name: External
uses: SINTEF/ci-cd/.github/workflows/[email protected].2
uses: SINTEF/ci-cd/.github/workflows/[email protected].3
if: github.repository_owner == 'EMMC-ASBL'
with:
# General
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
basic_tests:
name: External
uses: SINTEF/ci-cd/.github/workflows/[email protected].2
uses: SINTEF/ci-cd/.github/workflows/[email protected].3
with:
# pre-commit
run_pre-commit: true
Expand Down