diff --git a/.gitignore b/.gitignore index 184c7d38d2d8b1a7fd87b4adc55e3e054e2254a7..a16628c7a939eb614ab1c4c7bc5d220553afa1b9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ .nfs* atzlinux-archive-keyring_lastest_all.deb + +isodvd/tmp diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..20135c18c3c1e29d6f4d3a8eb2d952c50332329d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +1.build: + stage: build + tags: + - shell-atzlinux-jihu + script: + - unset DOCKER_HOST + - ./1.ci.caller.sh diff --git a/1.ci.caller.sh b/1.ci.caller.sh new file mode 100755 index 0000000000000000000000000000000000000000..37474183265221c368184bc1b66087fd2a62bc33 --- /dev/null +++ b/1.ci.caller.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set +x +export CMD_PATH=$(cd `dirname $0`; pwd) +cd $CMD_PATH +./2.ci.expect.sh diff --git a/2.ci.expect.sh b/2.ci.expect.sh new file mode 100755 index 0000000000000000000000000000000000000000..50ce1f794daa2f791b9811978d697a2cda98b09f --- /dev/null +++ b/2.ci.expect.sh @@ -0,0 +1,17 @@ +#!/usr/bin/expect -f +set timeout -1 + +spawn ./3.ci.worker.sh + +expect { + "Enter Import Password" + { + send "\r" + exp_continue + } + "Which services should be restarted" + { + send "1\r" + exp_continue + } +} diff --git a/3.ci.worker.sh b/3.ci.worker.sh new file mode 100755 index 0000000000000000000000000000000000000000..d2314c56da4366d267f6997c57d366be459798f2 --- /dev/null +++ b/3.ci.worker.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +export CMD_PATH=$(cd `dirname $0`; pwd) +export PROJECT_NAME="${CMD_PATH##*/}" +echo $PROJECT_NAME +cd $CMD_PATH +apt install simple-cdd -y +cd isodvd +rm -rf tmp/mirror/db/lockfile +./amd64.build.sh diff --git a/README.md b/README.md index 3b60c52141ae3efe57586965c8beb972a634b6b9..be041ae1feb244407a44185e28bf479a407a2c44 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +# 持续集成构建状态 + +[![pipeline status](https://jihulab.com/act365/atzlinux/debian-cn/badges/ci-build-jihu/pipeline.svg)](https://jihulab.com/act365/atzlinux/debian-cn/-/commits/ci-build-jihu) + +* 构建历史日志: https://jihulab.com/act365/atzlinux/debian-cn/-/pipelines + # 《铜豌豆 Linux》-- 中文 Linux 桌面操作系统 ![《铜豌豆 Linux》图标](https://cdn.atzlinux.com/pics/logo/atzlinux_144x144.png) diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh index c2a28c1e096c4e4c958127c4749f26561481625b..13fcacaa73d4f191f54f45b848c79a88c534542a 100755 --- a/isodvd/amd64.build.sh +++ b/isodvd/amd64.build.sh @@ -1 +1 @@ -build-simple-cdd --debug --dvd --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror https://mirrors.huaweicloud.com/debian-security/ --debian-mirror https://mirrors.huaweicloud.com/debian/ -b amd64.build +build-simple-cdd --force-root --debug --dvd --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror https://mirrors.huaweicloud.com/debian-security/ --debian-mirror https://mirrors.huaweicloud.com/debian/ -b amd64.build