From dad5d2aaa5bfba128305a6d19bc135abdd4bb403 Mon Sep 17 00:00:00 2001 From: chenwj113 Date: Sun, 2 Jun 2024 12:10:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20cicd=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=A4=E6=96=ADnull=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build_app.yaml | 6 +++++- .gitea/workflows/build_runtime.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build_app.yaml b/.gitea/workflows/build_app.yaml index d6c7199..95674e1 100644 --- a/.gitea/workflows/build_app.yaml +++ b/.gitea/workflows/build_app.yaml @@ -32,7 +32,11 @@ jobs: -H 'accept: application/json' \ -H 'X-Accept-Vulnerabilities: application/vnd.security.vulnerability.report; version=1.1, application/vnd.scanner.adapter.vuln.report.harbor+json; version=1.0' \ -u 'admin:Chenweijia!' | jq '.[0].tags[0].name') - new_version=$(echo $version | sed 's/\"//g' | awk -F. '{$NF = $NF + 1;} 1' OFS=.) + if [ ! $version ]; then + new_version=v1.0.0 + else + new_version=$(echo $version | sed 's/\"//g' | awk -F. '{$NF = $NF + 1;} 1' OFS=.) + fi docker build -t hub.airpig.cn/library/$repo:$new_version . docker push hub.airpig.cn/library/$repo:$new_version docker rmi hub.airpig.cn/library/$repo:$new_version diff --git a/.gitea/workflows/build_runtime.yaml b/.gitea/workflows/build_runtime.yaml index ecb87e1..3e3c4d7 100644 --- a/.gitea/workflows/build_runtime.yaml +++ b/.gitea/workflows/build_runtime.yaml @@ -29,7 +29,11 @@ jobs: -H 'accept: application/json' \ -H 'X-Accept-Vulnerabilities: application/vnd.security.vulnerability.report; version=1.1, application/vnd.scanner.adapter.vuln.report.harbor+json; version=1.0' \ -u 'admin:Chenweijia!' | jq '.[0].tags[0].name') - new_version=$(echo $version | sed 's/\"//g' | awk -F. '{$NF = $NF + 1;} 1' OFS=.) + if [ ! $version ]; then + new_version=v1.0.0 + else + new_version=$(echo $version | sed 's/\"//g' | awk -F. '{$NF = $NF + 1;} 1' OFS=.) + fi docker build -t hub.airpig.cn/library/$repo:$new_version -f RuntimeDockerfile . docker push hub.airpig.cn/library/$repo:$new_version docker rmi hub.airpig.cn/library/$repo:$new_version