fix(ci): resolve merge conflict in release workflow upload steps
This commit is contained in:
commit
828e8d3371
1 changed files with 17 additions and 15 deletions
32
.github/workflows/release.yml
vendored
32
.github/workflows/release.yml
vendored
|
|
@ -143,12 +143,12 @@ jobs:
|
|||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
TAG="${GITHUB_REF#refs/tags/}"
|
||||
upload() {
|
||||
gh release upload "$TAG" "$1" --repo "$GITHUB_REPOSITORY" --clobber || \
|
||||
(sleep 5 && gh release upload "$TAG" "$1" --repo "$GITHUB_REPOSITORY" --clobber)
|
||||
}
|
||||
for f in release/*.dmg release/*.zip release/*.blockmap; do
|
||||
[ -f "$f" ] && upload "$f"
|
||||
[ -f "$f" ] || continue
|
||||
echo "Uploading: $f"
|
||||
gh release upload "$TAG" "$f" --repo "$GITHUB_REPOSITORY" --clobber 2>&1 || \
|
||||
(sleep 5 && gh release upload "$TAG" "$f" --repo "$GITHUB_REPOSITORY" --clobber 2>&1) || \
|
||||
echo "WARNING: failed to upload $f, continuing..."
|
||||
done
|
||||
|
||||
release-win:
|
||||
|
|
@ -217,12 +217,12 @@ jobs:
|
|||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
TAG="${GITHUB_REF#refs/tags/}"
|
||||
upload() {
|
||||
gh release upload "$TAG" "$1" --repo "$GITHUB_REPOSITORY" --clobber || \
|
||||
(sleep 5 && gh release upload "$TAG" "$1" --repo "$GITHUB_REPOSITORY" --clobber)
|
||||
}
|
||||
for f in release/*.exe release/*.blockmap; do
|
||||
[ -f "$f" ] && upload "$f"
|
||||
[ -f "$f" ] || continue
|
||||
echo "Uploading: $f"
|
||||
gh release upload "$TAG" "$f" --repo "$GITHUB_REPOSITORY" --clobber 2>&1 || \
|
||||
(sleep 5 && gh release upload "$TAG" "$f" --repo "$GITHUB_REPOSITORY" --clobber 2>&1) || \
|
||||
echo "WARNING: failed to upload $f, continuing..."
|
||||
done
|
||||
|
||||
release-linux:
|
||||
|
|
@ -292,13 +292,15 @@ jobs:
|
|||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
run: |
|
||||
set -x
|
||||
TAG="${GITHUB_REF#refs/tags/}"
|
||||
upload() {
|
||||
gh release upload "$TAG" "$1" --repo "$GITHUB_REPOSITORY" --clobber || \
|
||||
(sleep 5 && gh release upload "$TAG" "$1" --repo "$GITHUB_REPOSITORY" --clobber)
|
||||
}
|
||||
ls -la release/ || true
|
||||
for f in release/*.AppImage release/*.deb release/*.rpm release/*.pacman release/*.blockmap; do
|
||||
[ -f "$f" ] && upload "$f"
|
||||
[ -f "$f" ] || continue
|
||||
echo "Uploading: $f"
|
||||
gh release upload "$TAG" "$f" --repo "$GITHUB_REPOSITORY" --clobber 2>&1 || \
|
||||
(sleep 5 && gh release upload "$TAG" "$f" --repo "$GITHUB_REPOSITORY" --clobber 2>&1) || \
|
||||
echo "WARNING: failed to upload $f, continuing..."
|
||||
done
|
||||
|
||||
upload-stable-links:
|
||||
|
|
|
|||
Loading…
Reference in a new issue