From 952434243fc110062059f9af7cee9e83feba3212 Mon Sep 17 00:00:00 2001 From: Michael Walther Date: Fri, 16 Jun 2023 10:44:53 +0200 Subject: [PATCH 1/7] Update bump_version.yml --- .github/workflows/bump_version.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index d0b878888..1b8154290 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -1,8 +1,7 @@ name: Bump version -on: - merge_group: +on: merge_group jobs: - build: + bump_version: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -38,4 +37,3 @@ jobs: uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ github.ref }} From a4502b25bd23cbb30f7a0a82b497a26720f870fd Mon Sep 17 00:00:00 2001 From: Michael Walther Date: Fri, 16 Jun 2023 11:06:52 +0200 Subject: [PATCH 2/7] Update pylint.yml --- .github/workflows/pylint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index f4c77d74d..a566ea1d8 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -10,7 +10,7 @@ on: merge_group: jobs: - build: + lint: runs-on: ubuntu-latest From 73e15747cfd11ec02a466627fae30810be583533 Mon Sep 17 00:00:00 2001 From: Michael Walther Date: Fri, 16 Jun 2023 11:07:13 +0200 Subject: [PATCH 3/7] Update python_package.yml --- .github/workflows/python_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_package.yml b/.github/workflows/python_package.yml index 2841714b9..70ef34539 100644 --- a/.github/workflows/python_package.yml +++ b/.github/workflows/python_package.yml @@ -14,7 +14,7 @@ env: SETUP_XVFB: True # avoid issues if mpl tries to open a GUI window jobs: - build: + test: runs-on: ubuntu-latest # the whole CI pipeline will be skipped if [ci skip] is in the commit msg if: "!contains(github.event.head_commit.message, '[ci skip]')" From cc3fbc5e52a3fe9a0b41df38e30d9bbc1dc65518 Mon Sep 17 00:00:00 2001 From: Michael Walther Date: Fri, 16 Jun 2023 11:19:52 +0200 Subject: [PATCH 4/7] follow github recommendation to only run on checks requested --- .github/workflows/bump_version.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index 1b8154290..fab44631b 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -1,5 +1,7 @@ name: Bump version -on: merge_group +on: + merge_group: + types: [checks_requested] jobs: bump_version: runs-on: ubuntu-latest From 532ea69799bccde4c676798e4d003b28ff0b1d68 Mon Sep 17 00:00:00 2001 From: Michael Walther Date: Fri, 16 Jun 2023 11:33:21 +0200 Subject: [PATCH 5/7] Update bump_version.yml --- .github/workflows/bump_version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index fab44631b..af98dc5da 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -6,10 +6,10 @@ jobs: bump_version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 - name: Install bump2version run: pip install bump2version From 4a7702037567271434b8c12361b1f1303d96fd5f Mon Sep 17 00:00:00 2001 From: Michael Walther Date: Fri, 16 Jun 2023 11:33:48 +0200 Subject: [PATCH 6/7] Update pylint.yml --- .github/workflows/pylint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index a566ea1d8..e53fe7b07 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.8 - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Install dependencies From 680f5ae54207c3e7068580c0da322fab15c68200 Mon Sep 17 00:00:00 2001 From: Michael Walther Date: Fri, 16 Jun 2023 11:34:17 +0200 Subject: [PATCH 7/7] Update python_package.yml --- .github/workflows/python_package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python_package.yml b/.github/workflows/python_package.yml index 70ef34539..244921dae 100644 --- a/.github/workflows/python_package.yml +++ b/.github/workflows/python_package.yml @@ -29,9 +29,9 @@ jobs: # OPENBLAS_NUM_THREADS: 1 # NUMEXPR_NUM_THREADS: 1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies