phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make electron builder compatible with node v16 (#1678)

Browse Source 
* make electron builder compatible with node v16

* Fix cp_artifacts.sh

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Devin Binnie <devin.binnie@mattermost.com>
This commit is contained in:
Guillermo Vayá
2021-08-03 15:30:15 +02:00
committed by GitHub
parent 2229ed3e84
commit 81baae30bf
3 changed files with 1265 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1790
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -87,7 +87,7 @@
"css-loader": "^1.0.1", "css-loader": "^1.0.1",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "12.0.1", "electron": "12.0.1",
"electron-builder": "^22.10.5", "electron-builder": "22.11.7",
"electron-connect": "^0.6.3", "electron-connect": "^0.6.3",
"electron-mocha": "^10.0.0", "electron-mocha": "^10.0.0",
"electron-notarize": "^1.0.0", "electron-notarize": "^1.0.0",

18
scripts/cp_artifacts.sh
View File

@@ -34,10 +34,26 @@ if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac.zip" ]]; then
fi fi
SOMETHING_COPIED=$((SOMETHING_COPIED + 8)) SOMETHING_COPIED=$((SOMETHING_COPIED + 8))
fi fi
if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac-x64.zip" ]]; then
echo -e "Copying mac-x64\n"
cp "${SRC}/mattermost-desktop-${VERSION}-mac-x64.zip" "${DEST}/mattermost-desktop-${VERSION}-mac-x64.zip"
if [[ -f "${SRC}"/mattermost-desktop-${VERSION}-mac-x64.dmg ]]; then
cp "${SRC}/mattermost-desktop-${VERSION}-mac-x64.dmg.blockmap" "${DEST}/mattermost-desktop-${VERSION}-mac-x64.dmg.blockmap"
fi
SOMETHING_COPIED=$((SOMETHING_COPIED + 8))
fi
if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac-arm64.zip" ]]; then
echo -e "Copying mac-arm64\n"
cp "${SRC}/mattermost-desktop-${VERSION}-mac-arm64.zip" "${DEST}/mattermost-desktop-${VERSION}-mac-arm64.zip"
if [[ -f "${SRC}"/mattermost-desktop-${VERSION}-mac-arm64.dmg ]]; then
cp "${SRC}/mattermost-desktop-${VERSION}-mac-arm64.dmg.blockmap" "${DEST}/mattermost-desktop-${VERSION}-mac-arm64.dmg.blockmap"
fi
SOMETHING_COPIED=$((SOMETHING_COPIED + 16))
fi
if [[ -f "${SRC}"/mattermost-desktop-${VERSION}-linux-x64.tar.gz ]]; then if [[ -f "${SRC}"/mattermost-desktop-${VERSION}-linux-x64.tar.gz ]]; then
echo -e "Copying linux\n" echo -e "Copying linux\n"
cp "${SRC}"/mattermost-desktop-*-linux-* "${DEST}/" cp "${SRC}"/mattermost-desktop-*-linux-* "${DEST}/"
SOMETHING_COPIED=$((SOMETHING_COPIED + 16)) SOMETHING_COPIED=$((SOMETHING_COPIED + 32))
fi fi
if [[ $SOMETHING_COPIED -eq 0 ]]; then if [[ $SOMETHING_COPIED -eq 0 ]]; then