Skip to content

Commit 1297f3a

Browse files
KVS85Simran-BLuschgySven Luschgy
authored
Add multiarch snippets for 3.10+ (#412)
* Initial commit * Adjust for ARM * Remove upgade-data-tests completely * Update switchBranches.fish * Update switchBranches.fish * Fix manifest caching * Fix buildPackages.fish for 3.10+ * Use fixed parallelism 10 for sanity check builds * added new cert hash (#413) added new cert hash Co-authored-by: Sven Luschgy <[email protected]> * Add multiarch repos for RPM and DEB (#415) * Modify snippets generation Co-authored-by: Simran Spiller <[email protected]> Co-authored-by: Sven Luschgy <[email protected]> Co-authored-by: Sven Luschgy <[email protected]>
1 parent 162e6d3 commit 1297f3a

26 files changed

+1010
-93
lines changed

‎helper.fish

+96-61
Original file line numberDiff line numberDiff line change
@@ -862,22 +862,33 @@ function makeSnippets
862862
set IN $argv[1]
863863
set OUT $argv[2]
864864
865+
set archSnippets "X86"
866+
if test "$USE_ARM" = "On"
867+
set archSnippets "X86" "ARM"
868+
end
869+
865870
community
866871
and buildSourceSnippet $IN $OUT
867-
and buildDebianSnippet $IN $OUT
868-
and buildRPMSnippet $IN $OUT
869-
and buildTarGzSnippet $IN $OUT
870-
and buildBundleSnippet $IN $OUT
871-
and buildWindowsSnippet $IN $OUT
872-
and buildDockerSnippet $OUT
873-
874-
and enterprise
875-
and buildDebianSnippet $IN $OUT
876-
and buildRPMSnippet $IN $OUT
877-
and buildTarGzSnippet $IN $OUT
878-
and buildBundleSnippet $IN $OUT
879-
and buildWindowsSnippet $IN $OUT
880-
and buildDockerSnippet $OUT
872+
873+
for edition in "community" "enterprise"
874+
eval "$edition"
875+
and buildDockerSnippet $OUT
876+
and for arch in $archSnippets
877+
switch "$arch"
878+
case "X86"
879+
buildDebianSnippet $IN $OUT "amd64" "x86_64"
880+
and buildRPMSnippet $IN $OUT "x86_64" "x86_64"
881+
and buildTarGzSnippet $IN $OUT "x86_64"
882+
and buildBundleSnippet $IN $OUT "x86_64"
883+
and buildWindowsSnippet $IN $OUT "win64"
884+
case "ARM"
885+
buildDebianSnippet $IN $OUT "arm64" "arm64"
886+
and buildRPMSnippet $IN $OUT "aarch64" "arm64"
887+
and buildTarGzSnippet $IN $OUT "arm64"
888+
and buildBundleSnippet $IN $OUT "arm64"
889+
end
890+
end
891+
end
881892
end
882893
883894
## #############################################################################
@@ -935,6 +946,15 @@ end
935946
## #############################################################################
936947
937948
function buildDebianSnippet
949+
set snippetArch "-$argv[3]"
950+
set packageArch $argv[3]
951+
set tarGzSuffix "_$argv[4]"
952+
953+
if test "$USE_ARM" = "Off"
954+
set snippetArch ""
955+
set tarGzSuffix ""
956+
end
957+
938958
if test "$ENTERPRISEEDITION" = "On"
939959
set ARANGODB_EDITION "Enterprise"
940960
set ARANGODB_PKG_NAME "arangodb3e"
@@ -951,9 +971,9 @@ function buildDebianSnippet
951971
end
952972
953973
set -l DEBIAN_VERSION "$ARANGODB_DEBIAN_UPSTREAM""-$ARANGODB_DEBIAN_REVISION"
954-
set -l DEBIAN_NAME_CLIENT "$ARANGODB_PKG_NAME""-client_$DEBIAN_VERSION""_amd64.deb"
955-
set -l DEBIAN_NAME_SERVER "$ARANGODB_PKG_NAME""_$DEBIAN_VERSION""_amd64.deb"
956-
set -l DEBIAN_NAME_DEBUG_SYMBOLS "$ARANGODB_PKG_NAME-dbg_$DEBIAN_VERSION""_amd64.deb"
974+
set -l DEBIAN_NAME_CLIENT "$ARANGODB_PKG_NAME""-client_$DEBIAN_VERSION""_$packageArch.deb"
975+
set -l DEBIAN_NAME_SERVER "$ARANGODB_PKG_NAME""_$DEBIAN_VERSION""_$packageArch.deb"
976+
set -l DEBIAN_NAME_DEBUG_SYMBOLS "$ARANGODB_PKG_NAME-dbg_$DEBIAN_VERSION""_$packageArch.deb"
957977
958978
set -l IN $argv[1]/$ARANGODB_PACKAGES/packages/$ARANGODB_EDITION/Linux/
959979
set -l OUT $argv[2]/release/snippets
@@ -970,14 +990,14 @@ function buildDebianSnippet
970990
set -l DEBIAN_SHA256_CLIENT (shasum -a 256 -b < $IN/$DEBIAN_NAME_CLIENT | awk '{print $1}')
971991
set -l DEBIAN_SHA256_DEBUG_SYMBOLS (shasum -a 256 -b < $IN/$DEBIAN_NAME_DEBUG_SYMBOLS | awk '{print $1}')
972992
973-
set -l TARGZ_NAME_SERVER "$ARANGODB_PKG_NAME-linux-$ARANGODB_TGZ_UPSTREAM.tar.gz"
993+
set -l TARGZ_NAME_SERVER "$ARANGODB_PKG_NAME-linux-$ARANGODB_TGZ_UPSTREAM$tarGzSuffix.tar.gz"
974994
975995
if test ! -f "$IN/$TARGZ_NAME_SERVER"; echo "TAR.GZ '$TARGZ_NAME_SERVER' is missing"; return 1; end
976996
977997
set -l TARGZ_SIZE_SERVER (expr (wc -c < $IN/$TARGZ_NAME_SERVER) / 1024 / 1024)
978998
set -l TARGZ_SHA256_SERVER (shasum -a 256 -b < $IN/$TARGZ_NAME_SERVER | awk '{print $1}')
979999
980-
set -l TARGZ_NAME_CLIENT "$ARANGODB_PKG_NAME-client-linux-$ARANGODB_TGZ_UPSTREAM.tar.gz"
1000+
set -l TARGZ_NAME_CLIENT "$ARANGODB_PKG_NAME-client-linux-$ARANGODB_TGZ_UPSTREAMtarGzSuffix.tar.gz"
9811001
set -l TARGZ_SIZE_CLIENT ""
9821002
set -l TARGZ_SHA256_CLIENT ""
9831003
@@ -986,7 +1006,7 @@ function buildDebianSnippet
9861006
set TARGZ_SHA256_CLIENT (shasum -a 256 -b < $IN/$TARGZ_NAME_CLIENT | awk '{print $1}')
9871007
end
9881008
989-
set -l n "$OUT/download-$ARANGODB_PKG_NAME-debian.html"
1009+
set -l n "$OUT/download-$ARANGODB_PKG_NAME-debian$snippetArch.html"
9901010
9911011
sed -e "s|@DEBIAN_NAME_SERVER@|$DEBIAN_NAME_SERVER|g" \
9921012
-e "s|@DEBIAN_NAME_CLIENT@|$DEBIAN_NAME_CLIENT|g" \
@@ -1012,7 +1032,7 @@ function buildDebianSnippet
10121032
-e "s|@ARANGODB_VERSION_RELEASE_NUMBER@|$ARANGODB_VERSION_RELEASE_NUMBER|g" \
10131033
-e "s|@ARANGODB_DOWNLOAD_WARNING@|$ARANGODB_DOWNLOAD_WARNING|g" \
10141034
-e "s|@DEBIAN_VERSION@|$DEBIAN_VERSION|g" \
1015-
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/debian.html.in > $n
1035+
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/debian$snippetArch.html.in > $n
10161036
10171037
and echo "Debian Snippet: $n"
10181038
end
@@ -1022,6 +1042,15 @@ end
10221042
## #############################################################################
10231043
10241044
function buildRPMSnippet
1045+
set snippetArch "-$argv[3]"
1046+
set packageArch $argv[3]
1047+
set tarGzSuffix "_$argv[4]"
1048+
1049+
if test "$USE_ARM" = "Off"
1050+
set snippetArch ""
1051+
set tarGzSuffix ""
1052+
end
1053+
10251054
if test "$ENTERPRISEEDITION" = "On"
10261055
set ARANGODB_EDITION "Enterprise"
10271056
set ARANGODB_PKG_NAME "arangodb3e"
@@ -1038,9 +1067,9 @@ function buildRPMSnippet
10381067
end
10391068
10401069
set -l RPM_VERSION "$ARANGODB_RPM_UPSTREAM-$ARANGODB_RPM_REVISION"
1041-
set -l RPM_NAME_CLIENT "$ARANGODB_PKG_NAME-client-$RPM_VERSION.x86_64.rpm"
1042-
set -l RPM_NAME_SERVER "$ARANGODB_PKG_NAME-$RPM_VERSION.x86_64.rpm"
1043-
set -l RPM_NAME_DEBUG_SYMBOLS "$ARANGODB_PKG_NAME-debuginfo-$RPM_VERSION.x86_64.rpm"
1070+
set -l RPM_NAME_CLIENT "$ARANGODB_PKG_NAME-client-$RPM_VERSION.$packageArch.rpm"
1071+
set -l RPM_NAME_SERVER "$ARANGODB_PKG_NAME-$RPM_VERSION.$packageArch.rpm"
1072+
set -l RPM_NAME_DEBUG_SYMBOLS "$ARANGODB_PKG_NAME-debuginfo-$RPM_VERSION.$packageArch.rpm"
10441073
10451074
set -l IN $argv[1]/$ARANGODB_PACKAGES/packages/$ARANGODB_EDITION/Linux/
10461075
set -l OUT $argv[2]/release/snippets
@@ -1057,14 +1086,14 @@ function buildRPMSnippet
10571086
set -l RPM_SHA256_CLIENT (shasum -a 256 -b < $IN/$RPM_NAME_CLIENT | awk '{print $1}')
10581087
set -l RPM_SHA256_DEBUG_SYMBOLS (shasum -a 256 -b < $IN/$RPM_NAME_DEBUG_SYMBOLS | awk '{print $1}')
10591088
1060-
set -l TARGZ_NAME_SERVER "$ARANGODB_PKG_NAME-linux-$ARANGODB_TGZ_UPSTREAM.tar.gz"
1089+
set -l TARGZ_NAME_SERVER "$ARANGODB_PKG_NAME-linux-$ARANGODB_TGZ_UPSTREAM$tarGzSuffix.tar.gz"
10611090
10621091
if test ! -f "$IN/$TARGZ_NAME_SERVER"; echo "TAR.GZ '$TARGZ_NAME_SERVER' is missing"; return 1; end
10631092
10641093
set -l TARGZ_SIZE_SERVER (expr (wc -c < $IN/$TARGZ_NAME_SERVER) / 1024 / 1024)
10651094
set -l TARGZ_SHA256_SERVER (shasum -a 256 -b < $IN/$TARGZ_NAME_SERVER | awk '{print $1}')
10661095
1067-
set -l TARGZ_NAME_CLIENT "$ARANGODB_PKG_NAME-client-linux-$ARANGODB_TGZ_UPSTREAM.tar.gz"
1096+
set -l TARGZ_NAME_CLIENT "$ARANGODB_PKG_NAME-client-linux-$ARANGODB_TGZ_UPSTREAM$tarGzSuffix.tar.gz"
10681097
set -l TARGZ_SIZE_CLIENT ""
10691098
set -l TARGZ_SHA256_CLIENT ""
10701099
@@ -1073,7 +1102,7 @@ function buildRPMSnippet
10731102
set TARGZ_SHA256_CLIENT (shasum -a 256 -b < $IN/$TARGZ_NAME_CLIENT | awk '{print $1}')
10741103
end
10751104
1076-
set -l n "$OUT/download-$ARANGODB_PKG_NAME-rpm.html"
1105+
set -l n "$OUT/download-$ARANGODB_PKG_NAME-rpm$snippetArch.html"
10771106
10781107
sed -e "s|@RPM_NAME_SERVER@|$RPM_NAME_SERVER|g" \
10791108
-e "s|@RPM_NAME_CLIENT@|$RPM_NAME_CLIENT|g" \
@@ -1100,11 +1129,11 @@ function buildRPMSnippet
11001129
-e "s|@ARANGODB_VERSION@|$ARANGODB_VERSION|g" \
11011130
-e "s|@ARANGODB_VERSION_RELEASE_NUMBER@|$ARANGODB_VERSION_RELEASE_NUMBER|g" \
11021131
-e "s|@ARANGODB_DOWNLOAD_WARNING@|$ARANGODB_DOWNLOAD_WARNING|g" \
1103-
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/rpm.html.in > $n
1132+
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/rpm$snippetArch.html.in > $n
11041133
11051134
and echo "RPM Snippet: $n"
11061135
1107-
and set -l n "$OUT/download-$ARANGODB_PKG_NAME-suse.html"
1136+
and set -l n "$OUT/download-$ARANGODB_PKG_NAME-suse$snippetArch.html"
11081137
11091138
and sed -e "s|@RPM_NAME_SERVER@|$RPM_NAME_SERVER|g" \
11101139
-e "s|@RPM_NAME_CLIENT@|$RPM_NAME_CLIENT|g" \
@@ -1131,7 +1160,7 @@ function buildRPMSnippet
11311160
-e "s|@ARANGODB_VERSION@|$ARANGODB_VERSION|g" \
11321161
-e "s|@ARANGODB_VERSION_RELEASE_NUMBER@|$ARANGODB_VERSION_RELEASE_NUMBER|g" \
11331162
-e "s|@ARANGODB_DOWNLOAD_WARNING@|$ARANGODB_DOWNLOAD_WARNING|g" \
1134-
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/suse.html.in > $n
1163+
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/suse$snippetArch.html.in > $n
11351164
11361165
and echo "SUSE Snippet: $n"
11371166
end
@@ -1141,6 +1170,14 @@ end
11411170
## #############################################################################
11421171
11431172
function buildTarGzSnippet
1173+
set snippetArch "-$argv[3]"
1174+
set tarGzSuffix "_$argv[3]"
1175+
1176+
if test "$USE_ARM" = "Off"
1177+
set snippetArch ""
1178+
set tarGzSuffix ""
1179+
end
1180+
11441181
if test "$ENTERPRISEEDITION" = "On"
11451182
set ARANGODB_EDITION "Enterprise"
11461183
set ARANGODB_PKG_NAME "arangodb3e"
@@ -1156,7 +1193,7 @@ function buildTarGzSnippet
11561193
set DOWNLOAD_LINK ""
11571194
end
11581195
1159-
set -l TARGZ_NAME_SERVER "$ARANGODB_PKG_NAME-linux-$ARANGODB_VERSION.tar.gz"
1196+
set -l TARGZ_NAME_SERVER "$ARANGODB_PKG_NAME-linux-$ARANGODB_VERSION$tarGzSuffix.tar.gz"
11601197
11611198
set -l IN $argv[1]/$ARANGODB_PACKAGES/packages/$ARANGODB_EDITION/Linux/
11621199
set -l OUT $argv[2]/release/snippets
@@ -1166,7 +1203,7 @@ function buildTarGzSnippet
11661203
set -l TARGZ_SIZE_SERVER (expr (wc -c < $IN/$TARGZ_NAME_SERVER) / 1024 / 1024)
11671204
set -l TARGZ_SHA256_SERVER (shasum -a 256 -b < $IN/$TARGZ_NAME_SERVER | awk '{print $1}')
11681205
1169-
set -l TARGZ_NAME_CLIENT "$ARANGODB_PKG_NAME-client-linux-$ARANGODB_TGZ_UPSTREAM.tar.gz"
1206+
set -l TARGZ_NAME_CLIENT "$ARANGODB_PKG_NAME-client-linux-$ARANGODB_TGZ_UPSTREAM$tarGzSuffix.tar.gz"
11701207
set -l TARGZ_SIZE_CLIENT ""
11711208
set -l TARGZ_SHA256_CLIENT ""
11721209
@@ -1175,7 +1212,7 @@ function buildTarGzSnippet
11751212
set TARGZ_SHA256_CLIENT (shasum -a 256 -b < $IN/$TARGZ_NAME_CLIENT | awk '{print $1}')
11761213
end
11771214
1178-
set -l n "$OUT/download-$ARANGODB_PKG_NAME-linux.html"
1215+
set -l n "$OUT/download-$ARANGODB_PKG_NAME-linux$snippetArch.html"
11791216
11801217
sed -e "s|@TARGZ_NAME_SERVER@|$TARGZ_NAME_SERVER|g" \
11811218
-e "s|@TARGZ_SIZE_SERVER@|$TARGZ_SIZE_SERVER|g" \
@@ -1191,7 +1228,7 @@ function buildTarGzSnippet
11911228
-e "s|@ARANGODB_VERSION@|$ARANGODB_VERSION|g" \
11921229
-e "s|@ARANGODB_VERSION_RELEASE_NUMBER@|$ARANGODB_VERSION_RELEASE_NUMBER|g" \
11931230
-e "s|@ARANGODB_DOWNLOAD_WARNING@|$ARANGODB_DOWNLOAD_WARNING|g" \
1194-
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/linux.html.in > $n
1231+
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/linux$snippetArch.html.in > $n
11951232
11961233
and echo "TarGZ Snippet: $n"
11971234
end
@@ -1201,6 +1238,14 @@ end
12011238
## #############################################################################
12021239
12031240
function buildBundleSnippet
1241+
set snippetArch "-$argv[3]"
1242+
set packageArch $argv[3]
1243+
set tarGzSuffix "_$argv[3]"
1244+
1245+
if test "$USE_ARM" = "Off"
1246+
set snippetArch ""
1247+
end
1248+
12041249
if test "$ENTERPRISEEDITION" = "On"
12051250
set ARANGODB_EDITION "Enterprise"
12061251
set ARANGODB_PKG_NAME "arangodb3e"
@@ -1216,24 +1261,7 @@ function buildBundleSnippet
12161261
set DOWNLOAD_LINK ""
12171262
end
12181263
1219-
set -l dmgArch "x86_64"
1220-
set -l tgzArch ""
1221-
if test "$USE_ARM" = "On"
1222-
switch "$ARCH"
1223-
case "x86_64"
1224-
set arch "$ARCH"
1225-
case '*'
1226-
if string match --quiet --regex '^arm64$|^aarch64$' $ARCH >/dev/null
1227-
set arch "arm64"
1228-
else
1229-
echo "fatal, unknown architecture $ARCH for rclone"
1230-
exit 1
1231-
end
1232-
set tgzArch "_$arch"
1233-
end
1234-
end
1235-
1236-
set -l BUNDLE_NAME_SERVER "$ARANGODB_PKG_NAME-$ARANGODB_DARWIN_UPSTREAM.$arch.dmg"
1264+
set -l BUNDLE_NAME_SERVER "$ARANGODB_PKG_NAME-$ARANGODB_DARWIN_UPSTREAM.$packageArch.dmg"
12371265
12381266
set -l IN $argv[1]/$ARANGODB_PACKAGES/packages/$ARANGODB_EDITION/MacOSX/
12391267
set -l OUT $argv[2]/release/snippets
@@ -1243,14 +1271,14 @@ function buildBundleSnippet
12431271
set -l BUNDLE_SIZE_SERVER (expr (wc -c < $IN/$BUNDLE_NAME_SERVER | tr -d " ") / 1024 / 1024)
12441272
set -l BUNDLE_SHA256_SERVER (shasum -a 256 -b < $IN/$BUNDLE_NAME_SERVER | awk '{print $1}')
12451273
1246-
set -l TARGZ_NAME_SERVER "$ARANGODB_PKG_NAME-macos-$ARANGODB_VERSION$tgzArch.tar.gz"
1274+
set -l TARGZ_NAME_SERVER "$ARANGODB_PKG_NAME-macos-$ARANGODB_VERSION$tarGzSuffix.tar.gz"
12471275
12481276
if test ! -f "$IN/$TARGZ_NAME_SERVER"; echo "TAR.GZ '$TARGZ_NAME_SERVER' is missing"; return 1; end
12491277
12501278
set -l TARGZ_SIZE_SERVER (expr (wc -c < $IN/$TARGZ_NAME_SERVER | tr -d " ") / 1024 / 1024)
12511279
set -l TARGZ_SHA256_SERVER (shasum -a 256 -b < $IN/$TARGZ_NAME_SERVER | awk '{print $1}')
12521280
1253-
set -l TARGZ_NAME_CLIENT "$ARANGODB_PKG_NAME-client-macos-$ARANGODB_TGZ_UPSTREAM$tgzArch.tar.gz"
1281+
set -l TARGZ_NAME_CLIENT "$ARANGODB_PKG_NAME-client-macos-$ARANGODB_TGZ_UPSTREAM$tarGzSuffix.tar.gz"
12541282
set -l TARGZ_SIZE_CLIENT ""
12551283
set -l TARGZ_SHA256_CLIENT ""
12561284
@@ -1259,7 +1287,7 @@ function buildBundleSnippet
12591287
set TARGZ_SHA256_CLIENT (shasum -a 256 -b < $IN/$TARGZ_NAME_CLIENT | awk '{print $1}')
12601288
end
12611289
1262-
set -l n "$OUT/download-$ARANGODB_PKG_NAME-macosx.html"
1290+
set -l n "$OUT/download-$ARANGODB_PKG_NAME-macosx$snippetArch.html"
12631291
12641292
sed -e "s|@BUNDLE_NAME_SERVER@|$BUNDLE_NAME_SERVER|g" \
12651293
-e "s|@BUNDLE_SIZE_SERVER@|$BUNDLE_SIZE_SERVER|g" \
@@ -1278,7 +1306,7 @@ function buildBundleSnippet
12781306
-e "s|@ARANGODB_VERSION@|$ARANGODB_VERSION|g" \
12791307
-e "s|@ARANGODB_VERSION_RELEASE_NUMBER@|$ARANGODB_VERSION_RELEASE_NUMBER|g" \
12801308
-e "s|@ARANGODB_DOWNLOAD_WARNING@|$ARANGODB_DOWNLOAD_WARNING|g" \
1281-
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/macosx.html.in > $n
1309+
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/macosx$snippetArch.html.in > $n
12821310
12831311
and echo "MacOSX Bundle Snippet: $n"
12841312
end
@@ -1288,6 +1316,13 @@ end
12881316
## #############################################################################
12891317
12901318
function buildWindowsSnippet
1319+
set snippetArch "-$argv[3]"
1320+
set packageArch $argv[3]
1321+
1322+
if test "$USE_ARM" = "Off"
1323+
set snippetArch ""
1324+
end
1325+
12911326
if test "$ENTERPRISEEDITION" = "On"
12921327
set ARANGODB_EDITION "Enterprise"
12931328
set ARANGODB_EDITION_LC "enterprise"
@@ -1305,9 +1340,9 @@ function buildWindowsSnippet
13051340
set DOWNLOAD_LINK ""
13061341
end
13071342
1308-
set -l WINDOWS_NAME_SERVER_EXE "$ARANGODB_PKG_NAME-$ARANGODB_VERSION""_win64.exe"
1309-
set -l WINDOWS_NAME_SERVER_ZIP "$ARANGODB_PKG_NAME-$ARANGODB_VERSION""_win64.zip"
1310-
set -l WINDOWS_NAME_CLIENT_EXE "$ARANGODB_PKG_NAME-client-$ARANGODB_VERSION""_win64.exe"
1343+
set -l WINDOWS_NAME_SERVER_EXE "$ARANGODB_PKG_NAME-$ARANGODB_VERSION""_$packageArch.exe"
1344+
set -l WINDOWS_NAME_SERVER_ZIP "$ARANGODB_PKG_NAME-$ARANGODB_VERSION""_$packageArch.zip"
1345+
set -l WINDOWS_NAME_CLIENT_EXE "$ARANGODB_PKG_NAME-client-$ARANGODB_VERSION""_$packageArch.exe"
13111346
13121347
set -l IN $argv[1]/$ARANGODB_PACKAGES/packages/$ARANGODB_EDITION/Windows/
13131348
set -l OUT $argv[2]/release/snippets
@@ -1325,7 +1360,7 @@ function buildWindowsSnippet
13251360
set -l WINDOWS_SIZE_CLIENT_EXE (expr (wc -c < $IN/$WINDOWS_NAME_CLIENT_EXE | tr -d " ") / 1024 / 1024)
13261361
set -l WINDOWS_SHA256_CLIENT_EXE (shasum -a 256 -b < $IN/$WINDOWS_NAME_CLIENT_EXE | awk '{print $1}')
13271362
1328-
set -l n "$OUT/download-windows-$ARANGODB_EDITION_LC.html"
1363+
set -l n "$OUT/download-windows$snippetArch-$ARANGODB_EDITION_LC.html"
13291364
13301365
sed -e "s|@WINDOWS_NAME_SERVER_EXE@|$WINDOWS_NAME_SERVER_EXE|g" \
13311366
-e "s|@WINDOWS_SIZE_SERVER_EXE@|$WINDOWS_SIZE_SERVER_EXE|g" \
@@ -1344,7 +1379,7 @@ function buildWindowsSnippet
13441379
-e "s|@ARANGODB_VERSION@|$ARANGODB_VERSION|g" \
13451380
-e "s|@ARANGODB_VERSION_RELEASE_NUMBER@|$ARANGODB_VERSION_RELEASE_NUMBER|g" \
13461381
-e "s|@ARANGODB_DOWNLOAD_WARNING@|$ARANGODB_DOWNLOAD_WARNING|g" \
1347-
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/windows.html.in > $n
1382+
< $WORKDIR/snippets/$ARANGODB_SNIPPETS/windows$snippetArch.html.in > $n
13481383
13491384
and echo "Windows Snippet: $n"
13501385
end

‎helper.mac.fish

+11-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ ln -s $SCRIPTSDIR/tools/sccache-apple-darwin-$ARCH $SCRIPTSDIR/tools/sccache
2020

2121
function defaultMacOSXDeploymentTarget
2222
set -xg MACOSX_DEPLOYMENT_TARGET 10.14
23+
if string match --quiet --regex '^arm64$|^aarch64$' $ARCH >/dev/null
24+
set -xg MACOSX_DEPLOYMENT_TARGET 11.0
25+
end
2326
end
2427

2528
if test -z "$MACOSX_DEPLOYMENT_TARGET"
@@ -80,7 +83,14 @@ function findRequiredMinMacOS
8083
echo "$f: no MACOS_MIN specified, using $MACOSX_DEPLOYMENT_TARGET"
8184
minMacOS $MACOSX_DEPLOYMENT_TARGET
8285
else
83-
echo "Using MACOS_MIN version '$v' from '$f'"
86+
if test "$USE_ARM" = "On"
87+
if string match --quiet --regex '^arm64$|^aarch64$' $ARCH >/dev/null
88+
echo "Using MACOS_MIN version '11.0' instead of '$v' from '$f' for ARM!"
89+
set v "11.0"
90+
end
91+
else
92+
echo "Using MACOS_MIN version '$v' from '$f'"
93+
end
8494
minMacOS $v
8595
end
8696
end

0 commit comments

Comments
 (0)