From 677dd9b058ea3e05c6d7cf4327faca3b4b55acf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 17:26:02 +0000 Subject: [PATCH 01/16] Bump ruff from 0.2.2 to 0.3.0 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.2.2 to 0.3.0. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/v0.2.2...v0.3.0) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 40 ++++++++++++++++++++-------------------- pyproject.toml | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/poetry.lock b/poetry.lock index 73b5ffd4..b3cc5985 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "alabaster" @@ -1249,28 +1249,28 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "ruff" -version = "0.2.2" +version = "0.3.0" description = "An extremely fast Python linter and code formatter, written in Rust." optional = false python-versions = ">=3.7" files = [ - {file = "ruff-0.2.2-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:0a9efb032855ffb3c21f6405751d5e147b0c6b631e3ca3f6b20f917572b97eb6"}, - {file = "ruff-0.2.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:d450b7fbff85913f866a5384d8912710936e2b96da74541c82c1b458472ddb39"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ecd46e3106850a5c26aee114e562c329f9a1fbe9e4821b008c4404f64ff9ce73"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5e22676a5b875bd72acd3d11d5fa9075d3a5f53b877fe7b4793e4673499318ba"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1695700d1e25a99d28f7a1636d85bafcc5030bba9d0578c0781ba1790dbcf51c"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:b0c232af3d0bd8f521806223723456ffebf8e323bd1e4e82b0befb20ba18388e"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f63d96494eeec2fc70d909393bcd76c69f35334cdbd9e20d089fb3f0640216ca"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6a61ea0ff048e06de273b2e45bd72629f470f5da8f71daf09fe481278b175001"}, - {file = "ruff-0.2.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5e1439c8f407e4f356470e54cdecdca1bd5439a0673792dbe34a2b0a551a2fe3"}, - {file = "ruff-0.2.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:940de32dc8853eba0f67f7198b3e79bc6ba95c2edbfdfac2144c8235114d6726"}, - {file = "ruff-0.2.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:0c126da55c38dd917621552ab430213bdb3273bb10ddb67bc4b761989210eb6e"}, - {file = "ruff-0.2.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:3b65494f7e4bed2e74110dac1f0d17dc8e1f42faaa784e7c58a98e335ec83d7e"}, - {file = "ruff-0.2.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1ec49be4fe6ddac0503833f3ed8930528e26d1e60ad35c2446da372d16651ce9"}, - {file = "ruff-0.2.2-py3-none-win32.whl", hash = "sha256:d920499b576f6c68295bc04e7b17b6544d9d05f196bb3aac4358792ef6f34325"}, - {file = "ruff-0.2.2-py3-none-win_amd64.whl", hash = "sha256:cc9a91ae137d687f43a44c900e5d95e9617cb37d4c989e462980ba27039d239d"}, - {file = "ruff-0.2.2-py3-none-win_arm64.whl", hash = "sha256:c9d15fc41e6054bfc7200478720570078f0b41c9ae4f010bcc16bd6f4d1aacdd"}, - {file = "ruff-0.2.2.tar.gz", hash = "sha256:e62ed7f36b3068a30ba39193a14274cd706bc486fad521276458022f7bccb31d"}, + {file = "ruff-0.3.0-py3-none-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:7deb528029bacf845bdbb3dbb2927d8ef9b4356a5e731b10eef171e3f0a85944"}, + {file = "ruff-0.3.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:e1e0d4381ca88fb2b73ea0766008e703f33f460295de658f5467f6f229658c19"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f7dbba46e2827dfcb0f0cc55fba8e96ba7c8700e0a866eb8cef7d1d66c25dcb"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:23dbb808e2f1d68eeadd5f655485e235c102ac6f12ad31505804edced2a5ae77"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ef655c51f41d5fa879f98e40c90072b567c666a7114fa2d9fe004dffba00932"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:d0d3d7ef3d4f06433d592e5f7d813314a34601e6c5be8481cccb7fa760aa243e"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b08b356d06a792e49a12074b62222f9d4ea2a11dca9da9f68163b28c71bf1dd4"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9343690f95710f8cf251bee1013bf43030072b9f8d012fbed6ad702ef70d360a"}, + {file = "ruff-0.3.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a1f3ed501a42f60f4dedb7805fa8d4534e78b4e196f536bac926f805f0743d49"}, + {file = "ruff-0.3.0-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:cc30a9053ff2f1ffb505a585797c23434d5f6c838bacfe206c0e6cf38c921a1e"}, + {file = "ruff-0.3.0-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:5da894a29ec018a8293d3d17c797e73b374773943e8369cfc50495573d396933"}, + {file = "ruff-0.3.0-py3-none-musllinux_1_2_i686.whl", hash = "sha256:755c22536d7f1889be25f2baf6fedd019d0c51d079e8417d4441159f3bcd30c2"}, + {file = "ruff-0.3.0-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:dd73fe7f4c28d317855da6a7bc4aa29a1500320818dd8f27df95f70a01b8171f"}, + {file = "ruff-0.3.0-py3-none-win32.whl", hash = "sha256:19eacceb4c9406f6c41af806418a26fdb23120dfe53583df76d1401c92b7c14b"}, + {file = "ruff-0.3.0-py3-none-win_amd64.whl", hash = "sha256:128265876c1d703e5f5e5a4543bd8be47c73a9ba223fd3989d4aa87dd06f312f"}, + {file = "ruff-0.3.0-py3-none-win_arm64.whl", hash = "sha256:e3a4a6d46aef0a84b74fcd201a4401ea9a6cd85614f6a9435f2d33dd8cefbf83"}, + {file = "ruff-0.3.0.tar.gz", hash = "sha256:0886184ba2618d815067cf43e005388967b67ab9c80df52b32ec1152ab49f53a"}, ] [[package]] @@ -1571,4 +1571,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "253993b04dfe967bfa65974cf26b00e8fe9853ddc45c5790bb665242cc161080" +content-hash = "cb23fa72c35f21981d4e1ea477c8d208ba0fa24a2c93c0c037f7c998da5ae85f" diff --git a/pyproject.toml b/pyproject.toml index 684c8fc8..ff404f9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ pytest = "^8.0.2" pytest-cov = "^4.1.0" pytest-random-order = "^1.1.1" pytest-xdist = "^3.5.0" -ruff = "^0.2.2" +ruff = "^0.3.0" sphinx = "^7.2.6" types-ldap3 = "^2.9.13" types-pytz = "^2024.1.0" From 8d07d812bce18b45737b39efb0abcf6f0014ce33 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 09:57:05 +0100 Subject: [PATCH 02/16] Fix add-assignee job --- .github/workflows/reviewing.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 02833fda..2cfa75e6 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -10,17 +10,19 @@ jobs: assignee: runs-on: ubuntu-latest timeout-minutes: 10 - if: >- - github.event.pull_request.user.login != ${{ vars.MEX_BOT_USER }} && - github.event.pull_request.user.login != 'dependabot[bot]' steps: - name: Add assignee env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then - echo assigning to ${{ github.event.pull_request.user.login }} - gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login }} + if gh api "users/${{ github.event.pull_request.user.login }}"; then + echo assigning to author ${{ github.event.pull_request.user.login }} + gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login }} + else + echo assigning to bot ${{ vars.MEX_BOT_USER }} + gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ vars.MEX_BOT_USER }} + fi else - echo already assigned + echo already assigned to ${{ github.event.pull_request.assignee.login }} fi From 9da22e2a1f2e730ed0071e57e81a26e7c9f095ed Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 10:05:54 +0100 Subject: [PATCH 03/16] Remove workflow dispatch --- .github/workflows/reviewing.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 2cfa75e6..6abadc95 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -4,7 +4,8 @@ on: pull_request: types: - opened - workflow_dispatch: + - edited + - reopened jobs: assignee: @@ -16,7 +17,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then - if gh api "users/${{ github.event.pull_request.user.login }}"; then + if gh api "users/${{ github.event.pull_request.user.login }}" --silent; then echo assigning to author ${{ github.event.pull_request.user.login }} gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login }} else From 2a4064729a2e3734092c776c2d0e59aba6e84ab6 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 10:17:32 +0100 Subject: [PATCH 04/16] Fix assigning in case of bot pr --- .github/workflows/reviewing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 6abadc95..84873474 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -17,11 +17,11 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then - if gh api "users/${{ github.event.pull_request.user.login }}" --silent; then - echo assigning to author ${{ github.event.pull_request.user.login }} + if [[ $(gh api "users/${{ github.event.pull_request.user.login }}" --jq ".type") -eq "User" ]]; then + echo assigning to ${{ github.event.pull_request.user.login }} gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login }} else - echo assigning to bot ${{ vars.MEX_BOT_USER }} + echo assigning to ${{ vars.MEX_BOT_USER }} gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ vars.MEX_BOT_USER }} fi else From 211ece92112cd0b44757a2ca8f7e6c55e7b49c66 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 10:22:59 +0100 Subject: [PATCH 05/16] Simplify assigning --- .github/workflows/reviewing.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 84873474..03b86747 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -1,10 +1,10 @@ -name: Review +name: Reviewing on: + push: pull_request: types: - opened - - edited - reopened jobs: @@ -17,13 +17,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then - if [[ $(gh api "users/${{ github.event.pull_request.user.login }}" --jq ".type") -eq "User" ]]; then - echo assigning to ${{ github.event.pull_request.user.login }} - gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login }} - else - echo assigning to ${{ vars.MEX_BOT_USER }} - gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ vars.MEX_BOT_USER }} - fi - else - echo already assigned to ${{ github.event.pull_request.assignee.login }} + gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login }} || + gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ vars.MEX_BOT_USER }} fi From 864fd1d0036cb2e2aa2aee3f9172d684e6406c35 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 10:26:35 +0100 Subject: [PATCH 06/16] Simplify assigning 2 --- .github/workflows/reviewing.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 03b86747..6aef2ea0 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -17,6 +17,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then - gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login }} || - gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ vars.MEX_BOT_USER }} + gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login || vars.MEX_BOT_USER }} fi From 02efb9ce33ab65ce31a1714d37eb573cf728017a Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 10:28:32 +0100 Subject: [PATCH 07/16] Simplify assigning 3 --- .github/workflows/reviewing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 6aef2ea0..513b3f7b 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -1,10 +1,10 @@ name: Reviewing on: - push: pull_request: types: - opened + - edited - reopened jobs: From ee828e4ce979b13b64a1aeb6a67e2f08123b1929 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 10:53:12 +0100 Subject: [PATCH 08/16] Simplify assigning 4 --- .github/workflows/reviewing.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 513b3f7b..e950a67f 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -17,5 +17,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then - gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee ${{ github.event.pull_request.user.login || vars.MEX_BOT_USER }} + pr_user="${{ github.event.pull_request.user.login }}" + if [[ $(gh api users/$(pr_user) --jq ".type") -q "BOT" ]]; then + pr_user="${{ vars.MEX_BOT_USER }}" + fi + gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee $pr_user fi From 6ab415e80529624e33c71924dc76b11c29434903 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 10:55:58 +0100 Subject: [PATCH 09/16] Simplify assigning 5 --- .github/workflows/reviewing.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index e950a67f..138dd560 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -18,7 +18,8 @@ jobs: run: | if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then pr_user="${{ github.event.pull_request.user.login }}" - if [[ $(gh api users/$(pr_user) --jq ".type") -q "BOT" ]]; then + user_type=$(gh api users/$(pr_user) --jq ".type") + if [[ $user_type -q "BOT" ]]; then pr_user="${{ vars.MEX_BOT_USER }}" fi gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee $pr_user From b33f84617e1c0213017e45b98341b3c83f27855d Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 11:00:55 +0100 Subject: [PATCH 10/16] Simplify assigning 6 --- .github/workflows/reviewing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 138dd560..d3898752 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -19,7 +19,7 @@ jobs: if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then pr_user="${{ github.event.pull_request.user.login }}" user_type=$(gh api users/$(pr_user) --jq ".type") - if [[ $user_type -q "BOT" ]]; then + if [[ $user_type -eq "BOT" ]]; then pr_user="${{ vars.MEX_BOT_USER }}" fi gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee $pr_user From 1b1249694c89a28f80dfa0a2cf80a6fa32b5bce5 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 11:04:36 +0100 Subject: [PATCH 11/16] Simplify assigning 7 --- .github/workflows/reviewing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index d3898752..63e89109 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -18,7 +18,7 @@ jobs: run: | if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then pr_user="${{ github.event.pull_request.user.login }}" - user_type=$(gh api users/$(pr_user) --jq ".type") + user_type=$(gh api "users/$(pr_user)" --jq ".type") if [[ $user_type -eq "BOT" ]]; then pr_user="${{ vars.MEX_BOT_USER }}" fi From 22ddd1f56d997d5e38f32f96771e3befbd00d285 Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 11:25:50 +0100 Subject: [PATCH 12/16] Simplify assigning 8 --- .github/workflows/reviewing.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 63e89109..e9a7dbfc 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -16,11 +16,11 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + user_name="${{ github.event.pull_request.user.login }}" + user_type=$(gh api "users/$(user_name)" --jq ".type") + if [[ "$user_type" != "User" ]]; then + user_name="${{ vars.MEX_BOT_USER }}" + fi if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then - pr_user="${{ github.event.pull_request.user.login }}" - user_type=$(gh api "users/$(pr_user)" --jq ".type") - if [[ $user_type -eq "BOT" ]]; then - pr_user="${{ vars.MEX_BOT_USER }}" - fi - gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee $pr_user + gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee $user_name fi From 0158c51d69c5ee170a029dd72edd7bbc9a7c38fb Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 11:27:16 +0100 Subject: [PATCH 13/16] Simplify assigning 9 --- .github/workflows/reviewing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index e9a7dbfc..31c5198e 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -17,7 +17,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | user_name="${{ github.event.pull_request.user.login }}" - user_type=$(gh api "users/$(user_name)" --jq ".type") + user_type=$(gh api "users/${user_name}" --jq ".type") if [[ "$user_type" != "User" ]]; then user_name="${{ vars.MEX_BOT_USER }}" fi From 5941cce4f0343f0227bcf1dfe5d786028635376c Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 11:30:30 +0100 Subject: [PATCH 14/16] Simplify assigning 10 --- .github/workflows/reviewing.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 31c5198e..4b3a4e12 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -18,8 +18,10 @@ jobs: run: | user_name="${{ github.event.pull_request.user.login }}" user_type=$(gh api "users/${user_name}" --jq ".type") + echo $user_name is a $user_type if [[ "$user_type" != "User" ]]; then user_name="${{ vars.MEX_BOT_USER }}" + echo using $user_name instead fi if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee $user_name From af2ebdbe24cccd52eb491381ef4934e2f540561a Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 11:32:00 +0100 Subject: [PATCH 15/16] Simplify assigning 11 --- .github/workflows/reviewing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 4b3a4e12..34530a8b 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -24,5 +24,5 @@ jobs: echo using $user_name instead fi if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then - gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee $user_name + gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee "${user_name}" fi From 5bb8cf32950328c7b1afc55e6cd712969533e9ab Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 5 Mar 2024 11:33:32 +0100 Subject: [PATCH 16/16] Simplify assigning 12 --- .github/workflows/reviewing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reviewing.yml b/.github/workflows/reviewing.yml index 34530a8b..973f0403 100644 --- a/.github/workflows/reviewing.yml +++ b/.github/workflows/reviewing.yml @@ -24,5 +24,6 @@ jobs: echo using $user_name instead fi if [[ -z "${{ github.event.pull_request.assignee.login }}" ]]; then + echo gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee "${user_name}" gh pr edit ${{ github.event.pull_request.html_url }} --add-assignee "${user_name}" fi