Skip to content

Commit d5f4b68

Browse files
authored
fix:fixed ci setup web error (#394)
* chore:fixed setup web * fix(ci):Fixed Setup Web CI
1 parent bdb880f commit d5f4b68

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

build.sh

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ builtAt="$(date +'%F %T %z')"
44
gitAuthor="The OpenList Projects Contributors <[email protected]>"
55
gitCommit=$(git log --pretty=format:"%h" -1)
66

7-
githubAuthHeader=""
8-
githubAuthValue=""
7+
githubAuthArgs=""
98
if [ -n "$GITHUB_TOKEN" ]; then
10-
githubAuthHeader="--header"
11-
githubAuthValue="Authorization: Bearer $GITHUB_TOKEN"
9+
githubAuthArgs="--header \"Authorization: Bearer $GITHUB_TOKEN\""
1210
fi
1311

1412
if [ "$1" = "dev" ]; then
@@ -21,7 +19,7 @@ else
2119
git tag -d beta || true
2220
# Always true if there's no tag
2321
version=$(git describe --abbrev=0 --tags 2>/dev/null || echo "v0.0.0")
24-
webVersion=$(curl -fsSL --max-time 2 $githubAuthHeader $githubAuthValue "https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
22+
webVersion=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g')
2523
fi
2624

2725
echo "backend version: $version"
@@ -37,12 +35,12 @@ ldflags="\
3735
"
3836

3937
FetchWebDev() {
40-
pre_release_tag=$(curl -fsSL --max-time 2 $githubAuthHeader $githubAuthValue https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases | jq -r 'map(select(.prerelease)) | first | .tag_name')
38+
pre_release_tag=$(eval "curl -fsSL --max-time 2 $githubAuthArgs https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases" | jq -r 'map(select(.prerelease)) | first | .tag_name')
4139
if [ -z "$pre_release_tag" ] || [ "$pre_release_tag" == "null" ]; then
4240
# fall back to latest release
43-
pre_release_json=$(curl -fsSL --max-time 2 $githubAuthHeader $githubAuthValue -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest")
41+
pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"")
4442
else
45-
pre_release_json=$(curl -fsSL --max-time 2 $githubAuthHeader $githubAuthValue -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/tags/$pre_release_tag")
43+
pre_release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/tags/$pre_release_tag\"")
4644
fi
4745
pre_release_assets=$(echo "$pre_release_json" | jq -r '.assets[].browser_download_url')
4846
pre_release_tar_url=$(echo "$pre_release_assets" | grep "openlist-frontend-dist" | grep "\.tar\.gz$")
@@ -53,7 +51,7 @@ FetchWebDev() {
5351
}
5452

5553
FetchWebRelease() {
56-
release_json=$(curl -fsSL --max-time 2 $githubAuthHeader $githubAuthValue -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest")
54+
release_json=$(eval "curl -fsSL --max-time 2 $githubAuthArgs -H \"Accept: application/vnd.github.v3+json\" \"https://api.github.com/repos/OpenListTeam/OpenList-Frontend/releases/latest\"")
5755
release_assets=$(echo "$release_json" | jq -r '.assets[].browser_download_url')
5856
release_tar_url=$(echo "$release_assets" | grep "openlist-frontend-dist" | grep "\.tar\.gz$")
5957
curl -fsSL "$release_tar_url" -o dist.tar.gz
@@ -254,7 +252,7 @@ BuildReleaseFreeBSD() {
254252
mkdir -p "build/freebsd"
255253

256254
# Get latest FreeBSD 14.x release version from GitHub
257-
freebsd_version=$(curl -fsSL --max-time 2 $githubAuthHeader $githubAuthValue "https://api.github.com/repos/freebsd/freebsd-src/tags" | \
255+
freebsd_version=$(eval "curl -fsSL --max-time 2 $githubAuthArgs \"https://api.github.com/repos/freebsd/freebsd-src/tags\"" | \
258256
jq -r '.[].name' | \
259257
grep '^release/14\.' | \
260258
sort -V | \

0 commit comments

Comments
 (0)