From d10ffc7ccf3db87abe5771becc9ffc02d03a356b Mon Sep 17 00:00:00 2001 From: Mohit Saxena Date: Sat, 3 Dec 2022 20:49:08 +0530 Subject: [PATCH 01/12] sync with remote --- .github/workflows/main.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7413fa7de4..edac6187ef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,6 +40,31 @@ env: jobs: + check_changed_folders: + name: Check files + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Get changed files in the _distutils folder + id: changed-files-specific-distutils + uses: tj-actions/changed-files@v34 + with: + files: | + setuptools/_distutils/** + - name: Get changed files in the _vendor folder + id: changed-files-specific-vendor + uses: tj-actions/changed-files@v34 + with: + files: | + setuptools/_vendor/** + - name: Run step if any file(s) in the docs folder change + if: steps.changed-files-specific-distutils.outputs.any_changed == 'true' || steps.changed-files-specific-vendor.outputs.any_changed == 'true' + run: | + echo "One or more files in the setuptools/_distutils or setuptools/_vendor folder has changed." + exit 1 test: strategy: matrix: @@ -111,6 +136,7 @@ jobs: - integration-test - test - test_cygwin + - check_changed_folders runs-on: ubuntu-latest From f04ba1f8201d61d4f8341bae94145eb65c944958 Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Sat, 17 Dec 2022 03:26:07 +0530 Subject: [PATCH 02/12] Update main.yml --- .github/workflows/main.yml | 51 +++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index edac6187ef..da320cbafb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,31 +40,6 @@ env: jobs: - check_changed_folders: - name: Check files - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Get changed files in the _distutils folder - id: changed-files-specific-distutils - uses: tj-actions/changed-files@v34 - with: - files: | - setuptools/_distutils/** - - name: Get changed files in the _vendor folder - id: changed-files-specific-vendor - uses: tj-actions/changed-files@v34 - with: - files: | - setuptools/_vendor/** - - name: Run step if any file(s) in the docs folder change - if: steps.changed-files-specific-distutils.outputs.any_changed == 'true' || steps.changed-files-specific-vendor.outputs.any_changed == 'true' - run: | - echo "One or more files in the setuptools/_distutils or setuptools/_vendor folder has changed." - exit 1 test: strategy: matrix: @@ -199,6 +174,32 @@ jobs: OS-${{ runner.os }}, VM-${{ matrix.platform }}, Py-${{ steps.python-install.outputs.python-version }} + + check_changed_folders: + name: Check files + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Get changed files in the _distutils folder + id: changed-files-specific-distutils + uses: tj-actions/changed-files@v34 + with: + files: | + setuptools/_distutils/** + - name: Get changed files in the _vendor folder + id: changed-files-specific-vendor + uses: tj-actions/changed-files@v34 + with: + files: | + setuptools/_vendor/** + - name: Run step if any file(s) in the docs folder change + if: steps.changed-files-specific-distutils.outputs.any_changed == 'true' || steps.changed-files-specific-vendor.outputs.any_changed == 'true' + run: | + echo "One or more files in the setuptools/_distutils or setuptools/_vendor folder has changed." + exit 1 integration-test: needs: test From 5293c30b7a8e795273f6fe7a132851ff365f0251 Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Thu, 22 Dec 2022 23:35:18 +0530 Subject: [PATCH 03/12] Update .github/workflows/main.yml Co-authored-by: Sviatoslav Sydorenko --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index da320cbafb..558391bb80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -108,10 +108,10 @@ jobs: if: always() needs: + - check_changed_folders - integration-test - test - test_cygwin - - check_changed_folders runs-on: ubuntu-latest From 01df0f6aff1ddeae5cb6e44c9e3511b3fdd0a030 Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Thu, 22 Dec 2022 23:35:28 +0530 Subject: [PATCH 04/12] Update .github/workflows/main.yml Co-authored-by: Sviatoslav Sydorenko --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 558391bb80..64c210eb2c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -175,7 +175,7 @@ jobs: VM-${{ matrix.platform }}, Py-${{ steps.python-install.outputs.python-version }} - check_changed_folders: + check-changed-folders: name: Check files runs-on: ubuntu-latest steps: From 8b704e647b906d4e87734673491129c346c2c398 Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Thu, 22 Dec 2022 23:35:38 +0530 Subject: [PATCH 05/12] Update .github/workflows/main.yml Co-authored-by: Sviatoslav Sydorenko --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64c210eb2c..be6afcb52c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -196,7 +196,9 @@ jobs: files: | setuptools/_vendor/** - name: Run step if any file(s) in the docs folder change - if: steps.changed-files-specific-distutils.outputs.any_changed == 'true' || steps.changed-files-specific-vendor.outputs.any_changed == 'true' + if: >- + steps.changed-files-specific-distutils.outputs.any_changed == 'true' + || steps.changed-files-specific-vendor.outputs.any_changed == 'true' run: | echo "One or more files in the setuptools/_distutils or setuptools/_vendor folder has changed." exit 1 From e8c52c81d86e370e53a1ef42f8e765d004db53b4 Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Fri, 23 Dec 2022 00:34:43 +0530 Subject: [PATCH 06/12] Update main.yml --- .github/workflows/main.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be6afcb52c..c777f2465f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -195,13 +195,16 @@ jobs: with: files: | setuptools/_vendor/** - - name: Run step if any file(s) in the docs folder change - if: >- - steps.changed-files-specific-distutils.outputs.any_changed == 'true' - || steps.changed-files-specific-vendor.outputs.any_changed == 'true' + - name: Run step if any file(s) in the _distutils folder change + if: steps.changed-files-specific-distutils.outputs.any_changed == 'true' run: | - echo "One or more files in the setuptools/_distutils or setuptools/_vendor folder has changed." - exit 1 + echo "One or more files in the setuptools/_distutils folder has changed." >> $GITHUB_STEP_SUMMARY + exit 1 + - name: Run step if any file(s) in the _vendor folder change + if: steps.changed-files-specific-vendor.outputs.any_changed == 'true' + run: | + echo "One or more files in the setuptools/_vendor folder has changed." >> $GITHUB_STEP_SUMMARY + exit 1 integration-test: needs: test From 47b0b08de6af29beafadcdb2eb1a9f19d5ceeedd Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Fri, 23 Dec 2022 01:34:07 +0530 Subject: [PATCH 07/12] Update .github/workflows/main.yml Co-authored-by: Sviatoslav Sydorenko --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c777f2465f..ba393a8302 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -108,7 +108,7 @@ jobs: if: always() needs: - - check_changed_folders + - check-changed-folders - integration-test - test - test_cygwin From c86f5ec73a1f513064d797119897241b0087d16c Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Fri, 23 Dec 2022 13:45:19 +0530 Subject: [PATCH 08/12] Update .github/workflows/main.yml Co-authored-by: Sviatoslav Sydorenko --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ba393a8302..d16e25100a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -198,7 +198,7 @@ jobs: - name: Run step if any file(s) in the _distutils folder change if: steps.changed-files-specific-distutils.outputs.any_changed == 'true' run: | - echo "One or more files in the setuptools/_distutils folder has changed." >> $GITHUB_STEP_SUMMARY + echo "One or more files in the setuptools/_distutils folder has changed." | tee "${GITHUB_STEP_SUMMARY}" exit 1 - name: Run step if any file(s) in the _vendor folder change if: steps.changed-files-specific-vendor.outputs.any_changed == 'true' From a4893f7c94e9bf28dbeb5667bbfdf11fe8eb71ee Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Fri, 23 Dec 2022 13:45:43 +0530 Subject: [PATCH 09/12] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d16e25100a..de0b00046a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -203,7 +203,7 @@ jobs: - name: Run step if any file(s) in the _vendor folder change if: steps.changed-files-specific-vendor.outputs.any_changed == 'true' run: | - echo "One or more files in the setuptools/_vendor folder has changed." >> $GITHUB_STEP_SUMMARY + echo "One or more files in the setuptools/_vendor folder has changed." | tee "${GITHUB_STEP_SUMMARY}" exit 1 integration-test: From c9526f1ca85d404d372b0dce1cca979d59586998 Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Mon, 26 Dec 2022 21:51:56 +0530 Subject: [PATCH 10/12] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de0b00046a..6b88a1feb8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -177,6 +177,7 @@ jobs: check-changed-folders: name: Check files + if: github.event_name == 'pull_request' runs-on: ubuntu-latest steps: - name: Checkout code From 3ee732000feb686cbd265b5ce5bab3056872d8df Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Wed, 28 Dec 2022 01:22:12 +0530 Subject: [PATCH 11/12] Update main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b88a1feb8..8c5b3672a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -176,7 +176,6 @@ jobs: Py-${{ steps.python-install.outputs.python-version }} check-changed-folders: - name: Check files if: github.event_name == 'pull_request' runs-on: ubuntu-latest steps: From 8d5633b409e26ec993fd2fa85b5d67080cef1bea Mon Sep 17 00:00:00 2001 From: Mohit Saxena <76725454+mohitsaxenaknoldus@users.noreply.github.com> Date: Wed, 28 Dec 2022 02:10:53 +0530 Subject: [PATCH 12/12] Update main.yml --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c5b3672a9..8e518c3e5f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -176,6 +176,7 @@ jobs: Py-${{ steps.python-install.outputs.python-version }} check-changed-folders: + name: Fail the job if files changed under _disutils/_vendor folders if: github.event_name == 'pull_request' runs-on: ubuntu-latest steps: @@ -183,24 +184,24 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Get changed files in the _distutils folder + - name: Check if files changed in the _distutils folder id: changed-files-specific-distutils uses: tj-actions/changed-files@v34 with: files: | setuptools/_distutils/** - - name: Get changed files in the _vendor folder + - name: Check if files changed in the _vendor folder id: changed-files-specific-vendor uses: tj-actions/changed-files@v34 with: files: | setuptools/_vendor/** - - name: Run step if any file(s) in the _distutils folder change + - name: Fail the job if any file(s) in the _distutils folder change if: steps.changed-files-specific-distutils.outputs.any_changed == 'true' run: | echo "One or more files in the setuptools/_distutils folder has changed." | tee "${GITHUB_STEP_SUMMARY}" exit 1 - - name: Run step if any file(s) in the _vendor folder change + - name: Fail the job if any file(s) in the _vendor folder change if: steps.changed-files-specific-vendor.outputs.any_changed == 'true' run: | echo "One or more files in the setuptools/_vendor folder has changed." | tee "${GITHUB_STEP_SUMMARY}"