@@ -248,7 +248,7 @@ jobs:
248
248
"name": "windows-x86_64",
249
249
"runner": "zephyr_runner",
250
250
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.2.3",
251
- "archive": "zip "
251
+ "archive": "7z "
252
252
},'
253
253
fi
254
254
@@ -305,7 +305,7 @@ jobs:
305
305
"runner": "windows-2019-8c",
306
306
"container": "",
307
307
"bundle-host": "windows-x86_64",
308
- "bundle-archive": "zip "
308
+ "bundle-archive": "7z "
309
309
},'
310
310
fi
311
311
@@ -409,7 +409,7 @@ jobs:
409
409
sudo apt-get install -y autoconf automake bison flex gettext \
410
410
help2man libboost-dev libboost-regex-dev \
411
411
libncurses5-dev libtool-bin libtool-doc \
412
- pkg-config texinfo zip
412
+ pkg-config texinfo p7zip
413
413
414
414
# Install dependencies for cross compilation
415
415
if [ "${{ matrix.host.name }}" == "linux-aarch64" ]; then
@@ -754,10 +754,9 @@ jobs:
754
754
XZ_OPT="-T0" \
755
755
${TAR} -Jcvf ${ARCHIVE_FILE} \
756
756
--owner=0 --group=0 -C ${OUTPUT_BASE}/${OUTPUT_DIR} ${{ matrix.target }}
757
- elif [ "${{ matrix.host.archive }}" == "zip " ]; then
757
+ elif [ "${{ matrix.host.archive }}" == "7z " ]; then
758
758
pushd ${OUTPUT_BASE}/${OUTPUT_DIR}
759
- zip -r ${GITHUB_WORKSPACE}/${ARCHIVE_FILE} \
760
- ${{ matrix.target }}
759
+ 7z a -t7z ${GITHUB_WORKSPACE}/${ARCHIVE_FILE} ${{ matrix.target }}
761
760
popd
762
761
fi
763
762
@@ -981,7 +980,7 @@ jobs:
981
980
982
981
# Install common dependencies
983
982
sudo apt-get update
984
- sudo apt-get install -y zip
983
+ sudo apt-get install -y p7zip
985
984
986
985
# Set environment variables
987
986
echo "TAR=tar" >> $GITHUB_ENV
@@ -1026,9 +1025,8 @@ jobs:
1026
1025
XZ_OPT="-T0" \
1027
1026
${TAR} -Jcvf ${ARCHIVE_FILE} --owner=0 --group=0 \
1028
1027
-C . cmake
1029
- elif [ "${{ matrix.host.archive }}" == "zip" ]; then
1030
- zip -r ${ARCHIVE_FILE} \
1031
- cmake
1028
+ elif [ "${{ matrix.host.archive }}" == "7z" ]; then
1029
+ 7z a -t7z ${ARCHIVE_FILE} cmake
1032
1030
fi
1033
1031
1034
1032
# Compute checksum
@@ -1071,7 +1069,7 @@ jobs:
1071
1069
1072
1070
# Install common dependencies
1073
1071
sudo apt-get update
1074
- sudo apt-get install -y jq zip
1072
+ sudo apt-get install -y jq p7zip
1075
1073
1076
1074
# Set environment variables
1077
1075
echo "TAR=tar" >> $GITHUB_ENV
@@ -1131,8 +1129,8 @@ jobs:
1131
1129
1132
1130
if [ "${{ matrix.host.archive }}" == "tar.xz" ]; then
1133
1131
EXTRACT="${TAR} -Jxvf"
1134
- elif [ "${{ matrix.host.archive }}" == "zip " ]; then
1135
- EXTRACT="unzip "
1132
+ elif [ "${{ matrix.host.archive }}" == "7z " ]; then
1133
+ EXTRACT="7z x -o. "
1136
1134
fi
1137
1135
1138
1136
# Create bundle directory
@@ -1185,8 +1183,8 @@ jobs:
1185
1183
XZ_OPT="-T0" \
1186
1184
${TAR} -Jcvf ${ARCHIVE_NAME}_minimal.${EXT} --owner=0 --group=0 \
1187
1185
-C . ${ARCHIVE_DIR}
1188
- elif [ "${{ matrix.host.archive }}" == "zip " ]; then
1189
- zip -r ${ARCHIVE_NAME}_minimal.${EXT} ${ARCHIVE_DIR}
1186
+ elif [ "${{ matrix.host.archive }}" == "7z " ]; then
1187
+ 7z a -t7z ${ARCHIVE_NAME}_minimal.${EXT} ${ARCHIVE_DIR}
1190
1188
fi
1191
1189
1192
1190
# Stage toolchains
@@ -1215,8 +1213,8 @@ jobs:
1215
1213
XZ_OPT="-T0" \
1216
1214
${TAR} -Jcvf ${ARCHIVE_NAME}.${EXT} --owner=0 --group=0 \
1217
1215
-C . ${ARCHIVE_DIR}
1218
- elif [ "${{ matrix.host.archive }}" == "zip " ]; then
1219
- zip -r ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_DIR}
1216
+ elif [ "${{ matrix.host.archive }}" == "7z " ]; then
1217
+ 7z a -t7z ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_DIR}
1220
1218
fi
1221
1219
1222
1220
# Compute checksum
@@ -1323,7 +1321,7 @@ jobs:
1323
1321
shopt -u dotglob
1324
1322
1325
1323
# Install required system packages
1326
- choco install ccache dtc-msys2 gperf jq ninja wget unzip
1324
+ choco install ccache dtc-msys2 gperf jq ninja wget 7zip
1327
1325
1328
1326
# Upgrade pip
1329
1327
python3 -m pip install --upgrade pip
@@ -1380,8 +1378,8 @@ jobs:
1380
1378
BUNDLE_FILE=${BUNDLE_NAME}.${{ matrix.testenv.bundle-archive }}
1381
1379
if [ "${{ matrix.testenv.bundle-archive }}" == "tar.xz" ]; then
1382
1380
${TAR} -Jxvf ${ARTIFACT_ROOT}/${BUNDLE_FILE} -C tools
1383
- elif [ "${{ matrix.testenv.bundle-archive }}" == "zip " ]; then
1384
- unzip ${ARTIFACT_ROOT}/${BUNDLE_FILE} -d tools
1381
+ elif [ "${{ matrix.testenv.bundle-archive }}" == "7z " ]; then
1382
+ 7z x -otools ${ARTIFACT_ROOT}/${BUNDLE_FILE}
1385
1383
fi
1386
1384
1387
1385
# Run setup script
0 commit comments