This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 212ad345b7 [chore](github) BE UT workflows support branch checks
(#15147)
212ad345b7 is described below
commit 212ad345b7c46866950f7d01b530f69ca06b8bad
Author: Adonis Ling <[email protected]>
AuthorDate: Sat Dec 17 16:54:02 2022 +0800
[chore](github) BE UT workflows support branch checks (#15147)
Apache Doris made the branch `branch-1.2-lts` protected. As a result, all
pull requests for this branch should be checked before merging it.
However, the BE UT workflows doesn't support branch checks and they fail to
check the pull requests for the branch `branch-1.2-lts`. The reason is that
they download the wrong pre-built third-party libraries when they check the
pull requests for `branch-1.2-lts`. This PR resolves this issue.
---
.github/workflows/be-ut-clang.yml | 10 ++++++++--
.github/workflows/be-ut-mac.yml | 10 ++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/be-ut-clang.yml
b/.github/workflows/be-ut-clang.yml
index aa09e705e5..927154e463 100644
--- a/.github/workflows/be-ut-clang.yml
+++ b/.github/workflows/be-ut-clang.yml
@@ -75,8 +75,14 @@ jobs:
sudo dpkg-reconfigure --frontend noninteractive tzdata
pushd thirdparty
- curl -L
https://github.com/apache/doris-thirdparty/releases/download/automation/doris-thirdparty-prebuilt-linux-x86_64.tar.xz
\
- -o doris-thirdparty-prebuilt-linux-x86_64.tar.xz
+ branch="${{ github.base_ref }}"
+ if [[ -z "${branch}" ]] || [[ "${branch}" == 'master' ]]; then
+ curl -L
https://github.com/apache/doris-thirdparty/releases/download/automation/doris-thirdparty-prebuilt-linux-x86_64.tar.xz
\
+ -o doris-thirdparty-prebuilt-linux-x86_64.tar.xz
+ else
+ curl -L
"https://github.com/apache/doris-thirdparty/releases/download/automation-${branch/branch-/}/doris-thirdparty-prebuilt-linux-x86_64.tar.xz";
\
+ -o doris-thirdparty-prebuilt-linux-x86_64.tar.xz
+ fi
tar -xvf doris-thirdparty-prebuilt-linux-x86_64.tar.xz
popd
diff --git a/.github/workflows/be-ut-mac.yml b/.github/workflows/be-ut-mac.yml
index e0e939f633..3307ec11b8 100644
--- a/.github/workflows/be-ut-mac.yml
+++ b/.github/workflows/be-ut-mac.yml
@@ -83,8 +83,14 @@ jobs:
brew install "${cellars[@]}"
pushd thirdparty
- curl -L
https://github.com/apache/doris-thirdparty/releases/download/automation/doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
\
- -o doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
+ branch="${{ github.base_ref }}"
+ if [[ -z "${branch}" ]] || [[ "${branch}" == 'master' ]]; then
+ curl -L
https://github.com/apache/doris-thirdparty/releases/download/automation/doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
\
+ -o doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
+ else
+ curl -L
"https://github.com/apache/doris-thirdparty/releases/download/automation-${branch/branch-/}/doris-thirdparty-prebuilt-darwin-x86_64.tar.xz";
\
+ -o doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
+ fi
tar -xvf doris-thirdparty-prebuilt-darwin-x86_64.tar.xz
popd
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
