From 7407881ac2a1e5098b33e57085311bc8d6696362 Mon Sep 17 00:00:00 2001 From: Dan Wang Date: Sun, 29 Sep 2024 19:01:43 +0800 Subject: [PATCH] fix(github): fix redundant hadoop-bin while uploading artifact --- .github/actions/rebuild_thirdparty_if_needed/action.yaml | 2 ++ .github/actions/unpack_prebuilt_thirdparties/action.yaml | 2 ++ .github/actions/upload_artifact/action.yaml | 2 -- .github/workflows/lint_and_test_cpp.yaml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/rebuild_thirdparty_if_needed/action.yaml b/.github/actions/rebuild_thirdparty_if_needed/action.yaml index 16acc2053d..d0ebc3fbf0 100644 --- a/.github/actions/rebuild_thirdparty_if_needed/action.yaml +++ b/.github/actions/rebuild_thirdparty_if_needed/action.yaml @@ -46,4 +46,6 @@ runs: ../admin_tools/download_zk.sh zookeeper-bin rm -rf hadoop-bin/share/doc rm -rf zookeeper-bin/docs + mv hadoop-bin .. + mv zookeeper-bin .. shell: bash diff --git a/.github/actions/unpack_prebuilt_thirdparties/action.yaml b/.github/actions/unpack_prebuilt_thirdparties/action.yaml index 0e1b2cdafd..eaa31ba4bb 100644 --- a/.github/actions/unpack_prebuilt_thirdparties/action.yaml +++ b/.github/actions/unpack_prebuilt_thirdparties/action.yaml @@ -27,4 +27,6 @@ runs: find ./thirdparty -name '*CMakeFiles*' -type d -exec rm -rf "{}" + rm -rf ./thirdparty/hadoop-bin/share/doc rm -rf ./thirdparty/zookeeper-bin/docs + mv hadoop-bin .. + mv zookeeper-bin .. shell: bash diff --git a/.github/actions/upload_artifact/action.yaml b/.github/actions/upload_artifact/action.yaml index 0fb6975d7b..a58606f9e8 100644 --- a/.github/actions/upload_artifact/action.yaml +++ b/.github/actions/upload_artifact/action.yaml @@ -21,8 +21,6 @@ runs: steps: - name: Tar files run: | - mv thirdparty/hadoop-bin ./ - mv thirdparty/zookeeper-bin ./ rm -rf thirdparty # The following operations are tricky, these directories and files don't exist if not build with '--test'. # When build binaries for client tests, it's not needed to add '--test'. diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml index bbe2571831..c30a82d422 100644 --- a/.github/workflows/lint_and_test_cpp.yaml +++ b/.github/workflows/lint_and_test_cpp.yaml @@ -27,7 +27,7 @@ on: - ci-test # testing branch for github action - '*dev' paths: - - .github/actions + - .github/actions/** - .github/workflows/lint_and_test_cpp.yaml - .github/workflows/thirdparty-regular-push.yml - build_tools/pack_server.sh