Skip to content

Commit dafd690

Browse files
committed
dos2unix doesn't exist
1 parent d9e79d7 commit dafd690

2 files changed

Lines changed: 17 additions & 10 deletions

File tree

.github/workflows/build-tools.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,18 @@ concurrency:
1010
cancel-in-progress: true
1111

1212
jobs:
13-
release:
13+
ensure-release:
1414
runs-on: ubuntu-latest
1515
permissions:
1616
contents: write
1717
steps:
18-
- name: Create or update release
18+
- name: Ensure release exists
1919
env:
2020
GH_TOKEN: ${{ github.token }}
21-
run: |
22-
NOTES="Automated tools build from ${GITHUB_SHA::7} on $(date -u +%Y-%m-%d)"
23-
gh release create tools --repo ${{ github.repository }} --title "Tools" --notes "$NOTES" --latest=false || \
24-
gh release edit tools --repo ${{ github.repository }} --notes "$NOTES"
21+
run: gh release create tools --title "Tools" --latest=false || true
2522

2623
build:
27-
needs: release
24+
needs: ensure-release
2825
strategy:
2926
matrix:
3027
include:
@@ -63,4 +60,15 @@ jobs:
6360
- name: Upload to release
6461
env:
6562
GH_TOKEN: ${{ github.token }}
66-
run: gh release upload tools --repo ${{ github.repository }} --clobber tools/${{ matrix.archive }}
63+
run: gh release upload tools --clobber tools/${{ matrix.archive }}
64+
65+
update-release:
66+
needs: build
67+
runs-on: ubuntu-latest
68+
permissions:
69+
contents: write
70+
steps:
71+
- name: Update release notes
72+
env:
73+
GH_TOKEN: ${{ github.token }}
74+
run: gh release edit tools --notes "Automated tools build from ${GITHUB_SHA::7} on $(date -u +%Y-%m-%d)"

tools/dump_source2.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ fi
4747
# Deduplicate .stringsignore
4848
STRINGSIGNORE="$DUMP_DIR/.stringsignore"
4949
if [[ -f "$STRINGSIGNORE" ]]; then
50-
sort -u "$STRINGSIGNORE" > "$STRINGSIGNORE.tmp" && mv "$STRINGSIGNORE.tmp" "$STRINGSIGNORE"
51-
dos2unix -q "$STRINGSIGNORE"
50+
tr -d '\r' < "$STRINGSIGNORE" | sort -u > "$STRINGSIGNORE.tmp" && mv "$STRINGSIGNORE.tmp" "$STRINGSIGNORE"
5251
fi
5352

5453
if [[ $DUMPER_EXIT_CODE -ne 0 ]]; then

0 commit comments

Comments
 (0)