Skip to content

Commit 6972733

Browse files
committed
More robust error detection
1 parent 745345e commit 6972733

3 files changed

Lines changed: 22 additions & 14 deletions

File tree

.github/workflows/build_windows_binaries.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
with:
4747
name: primecount-${{ env.PROJECT_VERSION }}-win-x64.zip
4848
path: build-release/primecount-${{ env.PROJECT_VERSION }}-win-x64/*
49+
if-no-files-found: error
4950
retention-days: 7
5051

5152
windows-arm64:
@@ -86,4 +87,5 @@ jobs:
8687
with:
8788
name: primecount-${{ env.PROJECT_VERSION }}-win-arm64.zip
8889
path: build-release/primecount-${{ env.PROJECT_VERSION }}-win-arm64/*
90+
if-no-files-found: error
8991
retention-days: 7

scripts/build_mingw64_arm64.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@ git checkout ..
6666

6767
# Create a release zip archive
6868
wget https://github.com/kimwalisch/primecount/releases/download/v7.20/primecount-7.20-win-arm64.zip
69-
unzip primecount-7.20-win-arm64.zip -d primecount-$VERSION-win-arm64
69+
unzip primecount-7.20-win-arm64.zip -d primecount-$VERSION-win-arm64-tmp
7070
rm primecount-7.20-win-arm64.zip
7171

7272
echo ""
7373
echo ""
74-
echo "Old file size: $(ls -l --block-size=K primecount-$VERSION-win-arm64/primecount.exe)"
74+
echo "Old file size: $(ls -l --block-size=K primecount-$VERSION-win-arm64-tmp/primecount.exe)"
7575
echo "New file size: $(ls -l --block-size=K primecount.exe)"
7676
echo ""
7777
echo ""
7878

79-
mv -f primecount.exe primecount-$VERSION-win-arm64
80-
cd primecount-$VERSION-win-arm64
79+
mv -f primecount.exe primecount-$VERSION-win-arm64-tmp
80+
cd primecount-$VERSION-win-arm64-tmp
8181
sed -i "1 s/.*/primecount $VERSION/" README.txt
8282
sed -i "2 s/.*/$FULL_DATE/" README.txt
8383
sed -i "3 s/.*/Copyright \(c\) 2013 - $YEAR, Kim Walisch\./" COPYING
@@ -87,15 +87,18 @@ sed -i "3 s/.*/Copyright \(c\) 2013 - $YEAR, Kim Walisch\./" COPYING
8787
[ "$(sed -n '2p' < README.txt)" = "$FULL_DATE" ] || handle_error "failed updating README.txt"
8888
[ "$(sed -n '3p' < COPYING)" = "Copyright (c) 2013 - $YEAR, Kim Walisch." ] || handle_error "failed updating COPYING"
8989

90-
zip primecount-$VERSION-win-arm64.zip primecount.exe README.txt COPYING
91-
mv primecount-$VERSION-win-arm64.zip ..
92-
9390
./primecount --test
9491
echo ""
9592
echo ""
9693
./primecount 1e18 -s
9794

95+
# Build release zip archive ########################################
96+
9897
cd ..
98+
mv primecount-$VERSION-win-arm64-tmp primecount-$VERSION-win-arm64
99+
cd primecount-$VERSION-win-arm64
100+
zip primecount-$VERSION-win-arm64.zip primecount.exe README.txt COPYING
101+
mv primecount-$VERSION-win-arm64.zip ..
99102

100103
####################################################################
101104

scripts/build_mingw64_x64.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ strip primecount.exe
5555

5656
# Create a release zip archive
5757
wget https://github.com/kimwalisch/primecount/releases/download/v7.20/primecount-7.20-win-x64.zip
58-
unzip primecount-7.20-win-x64.zip -d primecount-$VERSION-win-x64
58+
unzip primecount-7.20-win-x64.zip -d primecount-$VERSION-win-x64-tmp
5959
rm primecount-7.20-win-x64.zip
6060

6161
echo ""
6262
echo ""
63-
echo "Old file size: $(ls -l --block-size=K primecount-$VERSION-win-x64/primecount.exe)"
63+
echo "Old file size: $(ls -l --block-size=K primecount-$VERSION-win-x64-tmp/primecount.exe)"
6464
echo "New file size: $(ls -l --block-size=K primecount.exe)"
6565
echo ""
6666
echo ""
6767

68-
mv -f primecount.exe primecount-$VERSION-win-x64
69-
cd primecount-$VERSION-win-x64
68+
mv -f primecount.exe primecount-$VERSION-win-x64-tmp
69+
cd primecount-$VERSION-win-x64-tmp
7070
sed -i "1 s/.*/primecount $VERSION/" README.txt
7171
sed -i "2 s/.*/$FULL_DATE/" README.txt
7272
sed -i "3 s/.*/Copyright \(c\) 2013 - $YEAR, Kim Walisch\./" COPYING
@@ -76,15 +76,18 @@ sed -i "3 s/.*/Copyright \(c\) 2013 - $YEAR, Kim Walisch\./" COPYING
7676
[ "$(sed -n '2p' < README.txt)" = "$FULL_DATE" ] || handle_error "failed updating README.txt"
7777
[ "$(sed -n '3p' < COPYING)" = "Copyright (c) 2013 - $YEAR, Kim Walisch." ] || handle_error "failed updating COPYING"
7878

79-
zip primecount-$VERSION-win-x64.zip primecount.exe README.txt COPYING
80-
mv primecount-$VERSION-win-x64.zip ..
81-
8279
./primecount --test
8380
echo ""
8481
echo ""
8582
./primecount 1e18 -s
8683

84+
# Build release zip archive ########################################
85+
8786
cd ..
87+
mv primecount-$VERSION-win-x64-tmp primecount-$VERSION-win-x64
88+
cd primecount-$VERSION-win-x64
89+
zip primecount-$VERSION-win-x64.zip primecount.exe README.txt COPYING
90+
mv primecount-$VERSION-win-x64.zip ..
8891

8992
####################################################################
9093

0 commit comments

Comments
 (0)