summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-01-03 08:49:09 +0800
committerruki <[email protected]>2021-01-03 08:49:09 +0800
commit63722e7f41c83ec3baabec203f325b29f5709615 (patch)
tree889dcd3128bbe1d3b3c17f8a517855df97637e4f
parenta4730d01f05e7384a20d228ab3066d3ae923bdeb (diff)
fix ci for package tests
-rw-r--r--.github/workflows/debian_mips64.yml2
-rw-r--r--.github/workflows/ubuntu_arm.yml2
-rw-r--r--.github/workflows/ubuntu_arm64.yml2
-rw-r--r--tests/projects/package/basic/test.lua2
-rw-r--r--tests/projects/package/depconfigs/test.lua4
-rw-r--r--tests/projects/package/multiconfig/test.lua4
6 files changed, 10 insertions, 6 deletions
diff --git a/.github/workflows/debian_mips64.yml b/.github/workflows/debian_mips64.yml
index 585758972..0ee576e1a 100644
--- a/.github/workflows/debian_mips64.yml
+++ b/.github/workflows/debian_mips64.yml
@@ -22,7 +22,7 @@ jobs:
args: >
bash -c
"uname -a &&
- apt update && apt install -y unzip curl &&
+ apt update &&
cd /github/workspace &&
./scripts/get.sh __local__ &&
source ~/.xmake/profile &&
diff --git a/.github/workflows/ubuntu_arm.yml b/.github/workflows/ubuntu_arm.yml
index 6925e5ad3..e29aa3907 100644
--- a/.github/workflows/ubuntu_arm.yml
+++ b/.github/workflows/ubuntu_arm.yml
@@ -22,7 +22,7 @@ jobs:
args: >
bash -c
"uname -a &&
- apt update && apt install -y unzip curl &&
+ apt update &&
cd /github/workspace &&
./scripts/get.sh __local__ &&
source ~/.xmake/profile &&
diff --git a/.github/workflows/ubuntu_arm64.yml b/.github/workflows/ubuntu_arm64.yml
index 343a2df34..be7c7e169 100644
--- a/.github/workflows/ubuntu_arm64.yml
+++ b/.github/workflows/ubuntu_arm64.yml
@@ -22,7 +22,7 @@ jobs:
args: >
bash -c
"uname -a &&
- apt update && apt install -y unzip curl &&
+ apt update &&
cd /github/workspace &&
./scripts/get.sh __local__ &&
source ~/.xmake/profile &&
diff --git a/tests/projects/package/basic/test.lua b/tests/projects/package/basic/test.lua
index e834ab984..5050f2dd4 100644
--- a/tests/projects/package/basic/test.lua
+++ b/tests/projects/package/basic/test.lua
@@ -1,5 +1,5 @@
function main(t)
- if is_plat(os.subhost()) then
+ if is_plat(os.subhost()) and is_arch(os.subarch()) then
t:build()
end
end
diff --git a/tests/projects/package/depconfigs/test.lua b/tests/projects/package/depconfigs/test.lua
index b57362078..5050f2dd4 100644
--- a/tests/projects/package/depconfigs/test.lua
+++ b/tests/projects/package/depconfigs/test.lua
@@ -1,3 +1,5 @@
function main(t)
- t:build()
+ if is_plat(os.subhost()) and is_arch(os.subarch()) then
+ t:build()
+ end
end
diff --git a/tests/projects/package/multiconfig/test.lua b/tests/projects/package/multiconfig/test.lua
index b57362078..5050f2dd4 100644
--- a/tests/projects/package/multiconfig/test.lua
+++ b/tests/projects/package/multiconfig/test.lua
@@ -1,3 +1,5 @@
function main(t)
- t:build()
+ if is_plat(os.subhost()) and is_arch(os.subarch()) then
+ t:build()
+ end
end