@@ -252,7 +252,7 @@ jobs:
252
252
"name": "windows-x86_64",
253
253
"runner": "zephyr_runner",
254
254
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3",
255
- "archive": "zip "
255
+ "archive": "7z "
256
256
},'
257
257
fi
258
258
@@ -309,7 +309,7 @@ jobs:
309
309
"runner": "windows-2019-8c",
310
310
"container": "",
311
311
"bundle-host": "windows-x86_64",
312
- "bundle-archive": "zip "
312
+ "bundle-archive": "7z "
313
313
},'
314
314
fi
315
315
@@ -413,7 +413,7 @@ jobs:
413
413
sudo apt-get install -y autoconf automake bison flex gettext \
414
414
help2man libboost-dev libboost-regex-dev \
415
415
libncurses5-dev libtool-bin libtool-doc \
416
- pkg-config texinfo zip
416
+ pkg-config texinfo p7zip
417
417
418
418
# Install dependencies for cross compilation
419
419
if [ "${{ matrix.host.name }}" == "linux-aarch64" ]; then
@@ -758,10 +758,9 @@ jobs:
758
758
XZ_OPT="-T0" \
759
759
${TAR} -Jcvf ${ARCHIVE_FILE} \
760
760
--owner=0 --group=0 -C ${OUTPUT_BASE}/${OUTPUT_DIR} ${{ matrix.target }}
761
- elif [ "${{ matrix.host.archive }}" == "zip " ]; then
761
+ elif [ "${{ matrix.host.archive }}" == "7z " ]; then
762
762
pushd ${OUTPUT_BASE}/${OUTPUT_DIR}
763
- zip -r ${GITHUB_WORKSPACE}/${ARCHIVE_FILE} \
764
- ${{ matrix.target }}
763
+ 7z a -t7z -l ${GITHUB_WORKSPACE}/${ARCHIVE_FILE} ${{ matrix.target }}
765
764
popd
766
765
fi
767
766
@@ -985,7 +984,7 @@ jobs:
985
984
986
985
# Install common dependencies
987
986
sudo apt-get update
988
- sudo apt-get install -y zip
987
+ sudo apt-get install -y p7zip
989
988
990
989
# Set environment variables
991
990
echo "TAR=tar" >> $GITHUB_ENV
@@ -1030,9 +1029,8 @@ jobs:
1030
1029
XZ_OPT="-T0" \
1031
1030
${TAR} -Jcvf ${ARCHIVE_FILE} --owner=0 --group=0 \
1032
1031
-C . cmake
1033
- elif [ "${{ matrix.host.archive }}" == "zip" ]; then
1034
- zip -r ${ARCHIVE_FILE} \
1035
- cmake
1032
+ elif [ "${{ matrix.host.archive }}" == "7z" ]; then
1033
+ 7z a -t7z -l ${ARCHIVE_FILE} cmake
1036
1034
fi
1037
1035
1038
1036
# Compute checksum
@@ -1075,7 +1073,7 @@ jobs:
1075
1073
1076
1074
# Install common dependencies
1077
1075
sudo apt-get update
1078
- sudo apt-get install -y jq zip
1076
+ sudo apt-get install -y jq p7zip
1079
1077
1080
1078
# Set environment variables
1081
1079
echo "TAR=tar" >> $GITHUB_ENV
@@ -1135,8 +1133,8 @@ jobs:
1135
1133
1136
1134
if [ "${{ matrix.host.archive }}" == "tar.xz" ]; then
1137
1135
EXTRACT="${TAR} -Jxvf"
1138
- elif [ "${{ matrix.host.archive }}" == "zip " ]; then
1139
- EXTRACT="unzip "
1136
+ elif [ "${{ matrix.host.archive }}" == "7z " ]; then
1137
+ EXTRACT="7z x -o. "
1140
1138
fi
1141
1139
1142
1140
# Create bundle directory
@@ -1189,8 +1187,8 @@ jobs:
1189
1187
XZ_OPT="-T0" \
1190
1188
${TAR} -Jcvf ${ARCHIVE_NAME}_minimal.${EXT} --owner=0 --group=0 \
1191
1189
-C . ${ARCHIVE_DIR}
1192
- elif [ "${{ matrix.host.archive }}" == "zip " ]; then
1193
- zip -r ${ARCHIVE_NAME}_minimal.${EXT} ${ARCHIVE_DIR}
1190
+ elif [ "${{ matrix.host.archive }}" == "7z " ]; then
1191
+ 7z a -t7z -l ${ARCHIVE_NAME}_minimal.${EXT} ${ARCHIVE_DIR}
1194
1192
fi
1195
1193
1196
1194
# Stage toolchains
@@ -1219,8 +1217,8 @@ jobs:
1219
1217
XZ_OPT="-T0" \
1220
1218
${TAR} -Jcvf ${ARCHIVE_NAME}.${EXT} --owner=0 --group=0 \
1221
1219
-C . ${ARCHIVE_DIR}
1222
- elif [ "${{ matrix.host.archive }}" == "zip " ]; then
1223
- zip -r ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_DIR}
1220
+ elif [ "${{ matrix.host.archive }}" == "7z " ]; then
1221
+ 7z a -t7z -l ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_DIR}
1224
1222
fi
1225
1223
1226
1224
# Compute checksum
@@ -1327,7 +1325,7 @@ jobs:
1327
1325
shopt -u dotglob
1328
1326
1329
1327
# Install required system packages
1330
- choco install ccache dtc-msys2 gperf jq ninja wget unzip
1328
+ choco install ccache dtc-msys2 gperf jq ninja wget 7zip
1331
1329
1332
1330
# Upgrade pip
1333
1331
python3 -m pip install --upgrade pip
@@ -1384,8 +1382,8 @@ jobs:
1384
1382
BUNDLE_FILE=${BUNDLE_NAME}.${{ matrix.testenv.bundle-archive }}
1385
1383
if [ "${{ matrix.testenv.bundle-archive }}" == "tar.xz" ]; then
1386
1384
${TAR} -Jxvf ${ARTIFACT_ROOT}/${BUNDLE_FILE} -C tools
1387
- elif [ "${{ matrix.testenv.bundle-archive }}" == "zip " ]; then
1388
- unzip ${ARTIFACT_ROOT}/${BUNDLE_FILE} -d tools
1385
+ elif [ "${{ matrix.testenv.bundle-archive }}" == "7z " ]; then
1386
+ 7z x -otools ${ARTIFACT_ROOT}/${BUNDLE_FILE}
1389
1387
fi
1390
1388
1391
1389
# Run setup script
0 commit comments