From b4c16ae6bf1c8736539458d0032ce73f9ab29156 Mon Sep 17 00:00:00 2001 From: "zhenghao.zhu" Date: Tue, 28 Nov 2023 11:01:34 +0800 Subject: [PATCH] fix: fix build.yml --- Dockerfile | 2 ++ scripts/get-version.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d143dc2..b044bde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,8 @@ FROM docker.m.daocloud.io/nginx:${NGINX_IMAGE_VERSION} RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN apk -U upgrade +RUN ls dist + COPY dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/nginx.conf COPY startup.sh /usr/share diff --git a/scripts/get-version.sh b/scripts/get-version.sh index 13c958b..479e285 100755 --- a/scripts/get-version.sh +++ b/scripts/get-version.sh @@ -1,8 +1,10 @@ #!/bin/bash -# if [ -n "$GITHUB_REF" ]; then -# echo "$GITHUB_REF" -# else +if [[ $GITHUB_REF == refs/tags/* ]]; then + # Extract tag name from GITHUB_REF + tag_name=${GITHUB_REF#refs/tags/} + echo "$tag_name" +else if [ -n "$GITHUB_SHA" ]; then short_sha=${GITHUB_SHA::7} else @@ -12,4 +14,4 @@ pkg_version=$(cat package.json | grep version | head -1 | awk '{ print $2 }' | sed 's/[",]//g') echo "v${pkg_version}-dev-${short_sha}" -# fi \ No newline at end of file +fi