@@ -1061,24 +1061,6 @@ jobs:
1061
1061
## Extract CMake package archive
1062
1062
${EXTRACT} ${ARTIFACT_ROOT}/cmake_${HOST}/cmake_${HOST}.${EXT}
1063
1063
1064
- # Stage toolchains
1065
- ## Generate target list from the workflow matrix
1066
- TARGETS=$(echo '${{ needs.setup.outputs.targets }}' | jq -cr '.[]')
1067
-
1068
- ## Extract all toolchains
1069
- for TARGET in ${TARGETS}; do
1070
- TOOLCHAIN_ARTIFACT=toolchain_${HOST}_${TARGET}
1071
-
1072
- # Verify toolchain archive checksum
1073
- pushd ${ARTIFACT_ROOT}/${TOOLCHAIN_ARTIFACT}
1074
- md5sum --check md5.sum
1075
- sha256sum --check sha256.sum
1076
- popd
1077
-
1078
- # Extract toolchain archive
1079
- ${EXTRACT} ${ARTIFACT_ROOT}/${TOOLCHAIN_ARTIFACT}/${TOOLCHAIN_ARTIFACT}.${EXT}
1080
- done
1081
-
1082
1064
# Stage host tools
1083
1065
HOSTTOOLS_ARTIFACT=hosttools_${HOST}
1084
1066
if [ -d ${ARTIFACT_ROOT}/${HOSTTOOLS_ARTIFACT} ]; then
@@ -1104,7 +1086,36 @@ jobs:
1104
1086
esac
1105
1087
popd
1106
1088
1107
- # Create distribution bundle archive
1089
+ # Create minimal (without toolchains) distribution bundle archive
1090
+ if [ "${{ matrix.host.archive }}" == "tar.gz" ]; then
1091
+ ${TAR} -zcvf ${ARCHIVE_NAME}_minimal.${EXT} --owner=0 --group=0 \
1092
+ -C . ${ARCHIVE_DIR}
1093
+ elif [ "${{ matrix.host.archive }}" == "zip" ]; then
1094
+ zip -r ${ARCHIVE_NAME}_minimal.${EXT} ${ARCHIVE_DIR}
1095
+ fi
1096
+
1097
+ # Stage toolchains
1098
+ pushd ${ARCHIVE_DIR}
1099
+
1100
+ ## Generate target list from the workflow matrix
1101
+ TARGETS=$(echo '${{ needs.setup.outputs.targets }}' | jq -cr '.[]')
1102
+
1103
+ ## Extract all toolchains
1104
+ for TARGET in ${TARGETS}; do
1105
+ TOOLCHAIN_ARTIFACT=toolchain_${HOST}_${TARGET}
1106
+
1107
+ # Verify toolchain archive checksum
1108
+ pushd ${ARTIFACT_ROOT}/${TOOLCHAIN_ARTIFACT}
1109
+ md5sum --check md5.sum
1110
+ sha256sum --check sha256.sum
1111
+ popd
1112
+
1113
+ # Extract toolchain archive
1114
+ ${EXTRACT} ${ARTIFACT_ROOT}/${TOOLCHAIN_ARTIFACT}/${TOOLCHAIN_ARTIFACT}.${EXT}
1115
+ done
1116
+ popd
1117
+
1118
+ # Create full distribution bundle archive
1108
1119
if [ "${{ matrix.host.archive }}" == "tar.gz" ]; then
1109
1120
${TAR} -zcvf ${ARCHIVE_NAME}.${EXT} --owner=0 --group=0 \
1110
1121
-C . ${ARCHIVE_DIR}
@@ -1113,15 +1124,16 @@ jobs:
1113
1124
fi
1114
1125
1115
1126
# Compute checksum
1116
- md5sum ${ARCHIVE_NAME}.${EXT} > md5.sum
1117
- sha256sum ${ARCHIVE_NAME}.${EXT} > sha256.sum
1127
+ md5sum ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_NAME}_minimal.${EXT} > md5.sum
1128
+ sha256sum ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_NAME}_minimal.${EXT} > sha256.sum
1118
1129
1119
1130
- name : Upload distribution bundle
1120
1131
uses : actions/upload-artifact@v2
1121
1132
with :
1122
1133
name : ${{ env.BUNDLE_ARCHIVE_NAME }}
1123
1134
path : |
1124
1135
${{ env.BUNDLE_ARCHIVE_NAME }}.${{ matrix.host.archive }}
1136
+ ${{ env.BUNDLE_ARCHIVE_NAME }}_minimal.${{ matrix.host.archive }}
1125
1137
md5.sum
1126
1138
sha256.sum
1127
1139
@@ -1166,7 +1178,7 @@ jobs:
1166
1178
# Install required system packages
1167
1179
sudo apt-get update
1168
1180
sudo apt-get install -y ccache device-tree-compiler dos2unix gperf \
1169
- jq ninja-build
1181
+ jq ninja-build wget
1170
1182
1171
1183
# Upgrade pip
1172
1184
python3 -m pip install --upgrade pip
@@ -1191,7 +1203,7 @@ jobs:
1191
1203
shopt -u dotglob
1192
1204
1193
1205
# Install required system packages
1194
- brew install ccache coreutils dos2unix dtc gperf jq ninja
1206
+ brew install ccache coreutils dos2unix dtc gperf jq ninja wget
1195
1207
1196
1208
# Upgrade pip
1197
1209
sudo python3 -m pip install --upgrade pip
@@ -1215,7 +1227,7 @@ jobs:
1215
1227
shopt -u dotglob
1216
1228
1217
1229
# Install required system packages
1218
- choco install ccache dtc-msys2 gperf jq ninja
1230
+ choco install ccache dtc-msys2 gperf jq ninja wget unzip
1219
1231
1220
1232
# Upgrade pip
1221
1233
python3 -m pip install --upgrade pip
0 commit comments