From b86d542fd5e957567d949eadcfd3c2180a239c58 Mon Sep 17 00:00:00 2001 From: cipchk Date: Fri, 15 Mar 2024 16:41:25 +0800 Subject: [PATCH 1/3] ci: fix build post --- .github/workflows/ci.yml | 1 - scripts/ci/build-artifacts.sh | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b51bd9e75..4a0460400 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,6 @@ jobs: env: ACCESS_TOKEN: ${{ secrets.CI_TOKEN }} MESSAGE: ${{ github.event.pull_request.title || github.event.head_commit.message }} - BRANCH: ${{ github.ref_name }} - name: Build site run: yarn run site:build - name: 'Deploy Site' diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index fa0efa390..48639adc9 100755 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -34,7 +34,10 @@ buildVersion=$(node -pe "require('./package.json').version") branchName=${BRANCH:-'master'} buildVersionName="${buildVersion}-${commitSha}" -buildTagName="${branchName}-${commitSha}" +buildTagName=${TAG_NAME:-"${branchName}-${commitSha}"} +if [[ -n "${GITHUB_HEAD_REF}" ]]; then + buildTagName="${branchName}-${GITHUB_HEAD_REF}" +fi buildCommitMessage="${branchName} - ${MESSAGE}" repoUrl="https://github.com/ng-alain/${packageRepo}.git" From 7aebe48c7597c988e02a9444c52e2db8860169c9 Mon Sep 17 00:00:00 2001 From: cipchk Date: Fri, 15 Mar 2024 16:44:37 +0800 Subject: [PATCH 2/3] ci: fix --- scripts/ci/build-artifacts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index 48639adc9..82b457c12 100755 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -43,7 +43,7 @@ buildCommitMessage="${branchName} - ${MESSAGE}" repoUrl="https://github.com/ng-alain/${packageRepo}.git" repoDir="${DIST}/${packageRepo}" -echo "Starting publish process ${buildVersionName} into ${branchName}.." +echo "Starting publish process ${buildVersionName} into ${branchName}(tag:${buildTagName}).." rm -rf ${repoDir} mkdir -p ${repoDir} From f0a3c9e7fd886f7f07512eff739cb68cf3992de3 Mon Sep 17 00:00:00 2001 From: cipchk Date: Fri, 15 Mar 2024 16:48:15 +0800 Subject: [PATCH 3/3] ci: remove tag --- scripts/ci/build-artifacts.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh index 82b457c12..fa15ba763 100755 --- a/scripts/ci/build-artifacts.sh +++ b/scripts/ci/build-artifacts.sh @@ -92,7 +92,8 @@ echo "https://${ACCESS_TOKEN}:@github.com" > .git/credentials if [[ $(git ls-remote origin "refs/tags/${buildTagName}") ]]; then echo "removed tag because tag is already published" - git push origin :refs/tags/${buildTagName} + # git push origin :refs/tags/${buildTagName} + git push --delete origin ${buildTagName} fi echo "Git configuration has been updated to match the last commit author. Publishing now.."