From 770204c71858ace70ba6faf939bf68473812d6bd Mon Sep 17 00:00:00 2001 From: "Igoshev, Iaroslav" Date: Fri, 6 Sep 2024 16:17:00 +0000 Subject: [PATCH 1/6] FIX-#7389: Fix uploading artifacts Signed-off-by: Igoshev, Iaroslav --- .github/actions/upload-coverage/action.yml | 1 + .github/workflows/ci.yml | 1 + .github/workflows/fuzzydata-test.yml | 1 + .github/workflows/publish-to-pypi.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/actions/upload-coverage/action.yml b/.github/actions/upload-coverage/action.yml index 07c08984111..3d918f12c1c 100644 --- a/.github/actions/upload-coverage/action.yml +++ b/.github/actions/upload-coverage/action.yml @@ -15,3 +15,4 @@ runs: with: name: coverage-data-${{ env.COVERAGE_UUID }} path: .coverage* + include-hidden-files: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fb26225613..45396604876 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -235,6 +235,7 @@ jobs: with: name: Benchmarks log path: asv_bench/benchmarks.log + include-hidden-files: true if: failure() execution-filter: diff --git a/.github/workflows/fuzzydata-test.yml b/.github/workflows/fuzzydata-test.yml index c9b2b2a4a29..2dd86ad9dd6 100644 --- a/.github/workflows/fuzzydata-test.yml +++ b/.github/workflows/fuzzydata-test.yml @@ -48,3 +48,4 @@ jobs: name: fuzzydata-test-workflow-${{matrix.engine}} path: /tmp/fuzzydata-test-wf-${{matrix.engine}}/* # Must match output dir in test_fuzzydata.py if-no-files-found: error + include-hidden-files: true diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 514a72481cb..e2beac1eac9 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -38,6 +38,7 @@ jobs: with: name: modin-wheel-and-source-tarball path: ./dist/ + include-hidden-files: true - name: Publish Modin wheel to PyPI if: github.event_name == 'push' From 65a4a5a5616e26ba32fe664a9a536a43b0f0b7b0 Mon Sep 17 00:00:00 2001 From: "Igoshev, Iaroslav" Date: Fri, 6 Sep 2024 21:09:50 +0000 Subject: [PATCH 2/6] Provide path to actions/download-artifact@v4 Signed-off-by: Igoshev, Iaroslav --- .github/actions/upload-coverage/action.yml | 2 +- .github/workflows/ci.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/upload-coverage/action.yml b/.github/actions/upload-coverage/action.yml index 3d918f12c1c..8c35556f172 100644 --- a/.github/actions/upload-coverage/action.yml +++ b/.github/actions/upload-coverage/action.yml @@ -14,5 +14,5 @@ runs: - uses: actions/upload-artifact@v4 with: name: coverage-data-${{ env.COVERAGE_UUID }} - path: .coverage* + path: .coverage include-hidden-files: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45396604876..9afdcbc51c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -721,6 +721,7 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: coverage-data + path: .coverage pattern: coverage-data-* delete-merged: true @@ -740,6 +741,7 @@ jobs: uses: actions/download-artifact@v4 with: name: coverage-data + path: .coverage - run: pip install coverage - name: Combine coverage run: python -m coverage combine From 95f397b6f1e7db0c88ba23e9da81db9e42b8b181 Mon Sep 17 00:00:00 2001 From: "Igoshev, Iaroslav" Date: Sat, 7 Sep 2024 21:54:59 +0000 Subject: [PATCH 3/6] fix Signed-off-by: Igoshev, Iaroslav --- .github/actions/upload-coverage/action.yml | 2 +- .github/workflows/ci.yml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/upload-coverage/action.yml b/.github/actions/upload-coverage/action.yml index 8c35556f172..99868fddbe0 100644 --- a/.github/actions/upload-coverage/action.yml +++ b/.github/actions/upload-coverage/action.yml @@ -14,5 +14,5 @@ runs: - uses: actions/upload-artifact@v4 with: name: coverage-data-${{ env.COVERAGE_UUID }} - path: .coverage + path: .coverage*/ include-hidden-files: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9afdcbc51c1..45396604876 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -721,7 +721,6 @@ jobs: uses: actions/upload-artifact/merge@v4 with: name: coverage-data - path: .coverage pattern: coverage-data-* delete-merged: true @@ -741,7 +740,6 @@ jobs: uses: actions/download-artifact@v4 with: name: coverage-data - path: .coverage - run: pip install coverage - name: Combine coverage run: python -m coverage combine From ceda52ff38a27a76c37a9a755cfa490f42ec9912 Mon Sep 17 00:00:00 2001 From: "Igoshev, Iaroslav" Date: Mon, 9 Sep 2024 08:29:48 +0000 Subject: [PATCH 4/6] Fix Signed-off-by: Igoshev, Iaroslav --- .github/actions/upload-coverage/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/upload-coverage/action.yml b/.github/actions/upload-coverage/action.yml index 99868fddbe0..3d918f12c1c 100644 --- a/.github/actions/upload-coverage/action.yml +++ b/.github/actions/upload-coverage/action.yml @@ -14,5 +14,5 @@ runs: - uses: actions/upload-artifact@v4 with: name: coverage-data-${{ env.COVERAGE_UUID }} - path: .coverage*/ + path: .coverage* include-hidden-files: true From 6ac0aecd353dfd267977b04c2202507f4116d81c Mon Sep 17 00:00:00 2001 From: "Igoshev, Iaroslav" Date: Mon, 9 Sep 2024 10:16:22 +0000 Subject: [PATCH 5/6] Add actions/checkout@v4 to merge artifacts Signed-off-by: Igoshev, Iaroslav --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45396604876..9e1f28958b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -717,6 +717,7 @@ jobs: run: shell: bash -l {0} steps: + - uses: actions/checkout@v4 - name: Merge Artifacts uses: actions/upload-artifact/merge@v4 with: From fa94897c9bbf03a6ba0e61860f8024d64cf1b493 Mon Sep 17 00:00:00 2001 From: "Igoshev, Iaroslav" Date: Mon, 9 Sep 2024 12:28:44 +0000 Subject: [PATCH 6/6] Provide include-hidden-files: true to merge artifacts Signed-off-by: Igoshev, Iaroslav --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e1f28958b4..ceb6c55264a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -717,12 +717,12 @@ jobs: run: shell: bash -l {0} steps: - - uses: actions/checkout@v4 - name: Merge Artifacts uses: actions/upload-artifact/merge@v4 with: name: coverage-data pattern: coverage-data-* + include-hidden-files: true delete-merged: true upload-coverage: