From 430d4e3888ad3fa1902eed7db1cd9e06abd36146 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 29 Aug 2022 16:18:59 +0200 Subject: [PATCH 1/3] ci: force workflows to there respective branch when manually launched skip-checks: true --- .github/workflows/insider-linux.yml | 1 + .github/workflows/insider-macos.yml | 1 + .github/workflows/insider-spearhead.yml | 1 + .github/workflows/insider-windows.yml | 1 + .github/workflows/stable-linux.yml | 1 + .github/workflows/stable-macos.yml | 1 + .github/workflows/stable-windows.yml | 1 + 7 files changed, 7 insertions(+) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index fd39db5..ec07674 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -2,6 +2,7 @@ name: insider-linux on: workflow_dispatch: + branches: [ insider ] schedule: - cron: '0 1 * * *' push: diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml index e8a09e9..0d34235 100644 --- a/.github/workflows/insider-macos.yml +++ b/.github/workflows/insider-macos.yml @@ -2,6 +2,7 @@ name: insider-macos on: workflow_dispatch: + branches: [ insider ] schedule: - cron: '0 1 * * *' push: diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml index 26427a7..9308538 100644 --- a/.github/workflows/insider-spearhead.yml +++ b/.github/workflows/insider-spearhead.yml @@ -2,6 +2,7 @@ name: insider-spearhead on: workflow_dispatch: + branches: [ insider ] schedule: - cron: '0 0 * * *' diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 4b942fa..dfae0c3 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -2,6 +2,7 @@ name: insider-windows on: workflow_dispatch: + branches: [ insider ] schedule: - cron: '0 1 * * *' push: diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 908c2f8..6991814 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -2,6 +2,7 @@ name: stable-linux on: workflow_dispatch: + branches: [ master ] inputs: new_release: type: boolean diff --git a/.github/workflows/stable-macos.yml b/.github/workflows/stable-macos.yml index f1954f7..e4a35d2 100644 --- a/.github/workflows/stable-macos.yml +++ b/.github/workflows/stable-macos.yml @@ -2,6 +2,7 @@ name: stable-macos on: workflow_dispatch: + branches: [ master ] inputs: new_release: type: boolean diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index 8a3f990..cc70dbc 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -2,6 +2,7 @@ name: stable-windows on: workflow_dispatch: + branches: [ master ] inputs: new_release: type: boolean From 697bd5ef8361b9ed7f38440ce39c10bbd7e11983 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 29 Aug 2022 17:53:29 +0200 Subject: [PATCH 2/3] refactor: move artifacts building and signing into prepare_artifacts.sh [skip ci] (#1221) --- .github/workflows/insider-linux.yml | 1 - .github/workflows/insider-macos.yml | 19 +------ .github/workflows/insider-spearhead.yml | 1 - .github/workflows/insider-windows.yml | 1 - .github/workflows/stable-linux.yml | 1 - .github/workflows/stable-macos.yml | 19 +------ .github/workflows/stable-windows.yml | 1 - build.sh | 37 +------------- build/build.sh | 22 ++++++--- prepare_artifacts.sh | 66 +++++++++++++++++++++++++ 10 files changed, 85 insertions(+), 83 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index ec07674..fd39db5 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -2,7 +2,6 @@ name: insider-linux on: workflow_dispatch: - branches: [ insider ] schedule: - cron: '0 1 * * *' push: diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml index 0d34235..1227868 100644 --- a/.github/workflows/insider-macos.yml +++ b/.github/workflows/insider-macos.yml @@ -2,7 +2,6 @@ name: insider-macos on: workflow_dispatch: - branches: [ insider ] schedule: - cron: '0 1 * * *' push: @@ -75,27 +74,11 @@ jobs: run: ./build.sh if: env.SHOULD_BUILD == 'yes' - - name: Sign binary + - name: Prepare artifacts env: CERTIFICATE_OSX_P12: ${{ secrets.CERTIFICATE_OSX_P12 }} CERTIFICATE_OSX_PASSWORD: ${{ secrets.CERTIFICATE_OSX_PASSWORD }} CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }} - if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' - run: | - if [ -d "VSCode-darwin-${VSCODE_ARCH}" ]; then # just in case the build failed - cd "VSCode-darwin-${VSCODE_ARCH}" - export CERTIFICATE_P12=VSCodium.p12 - echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12 - export KEYCHAIN=$RUNNER_TEMP/build.keychain - security create-keychain -p mysecretpassword $KEYCHAIN - security default-keychain -s $KEYCHAIN - security unlock-keychain -p mysecretpassword $KEYCHAIN - security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN - codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app - fi - - - name: Prepare artifacts run: ./prepare_artifacts.sh if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml index 9308538..26427a7 100644 --- a/.github/workflows/insider-spearhead.yml +++ b/.github/workflows/insider-spearhead.yml @@ -2,7 +2,6 @@ name: insider-spearhead on: workflow_dispatch: - branches: [ insider ] schedule: - cron: '0 0 * * *' diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index dfae0c3..4b942fa 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -2,7 +2,6 @@ name: insider-windows on: workflow_dispatch: - branches: [ insider ] schedule: - cron: '0 1 * * *' push: diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 6991814..908c2f8 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -2,7 +2,6 @@ name: stable-linux on: workflow_dispatch: - branches: [ master ] inputs: new_release: type: boolean diff --git a/.github/workflows/stable-macos.yml b/.github/workflows/stable-macos.yml index e4a35d2..6becd82 100644 --- a/.github/workflows/stable-macos.yml +++ b/.github/workflows/stable-macos.yml @@ -2,7 +2,6 @@ name: stable-macos on: workflow_dispatch: - branches: [ master ] inputs: new_release: type: boolean @@ -78,27 +77,11 @@ jobs: run: ./build.sh if: env.SHOULD_BUILD == 'yes' - - name: Sign binary + - name: Prepare artifacts env: CERTIFICATE_OSX_P12: ${{ secrets.CERTIFICATE_OSX_P12 }} CERTIFICATE_OSX_PASSWORD: ${{ secrets.CERTIFICATE_OSX_PASSWORD }} CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }} - if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' - run: | - if [ -d "VSCode-darwin-${VSCODE_ARCH}" ]; then # just in case the build failed - cd "VSCode-darwin-${VSCODE_ARCH}" - export CERTIFICATE_P12=VSCodium.p12 - echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12 - export KEYCHAIN=$RUNNER_TEMP/build.keychain - security create-keychain -p mysecretpassword $KEYCHAIN - security default-keychain -s $KEYCHAIN - security unlock-keychain -p mysecretpassword $KEYCHAIN - security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign - security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN - codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app - fi - - - name: Prepare artifacts run: ./prepare_artifacts.sh if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index cc70dbc..8a3f990 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -2,7 +2,6 @@ name: stable-windows on: workflow_dispatch: - branches: [ master ] inputs: new_release: type: boolean diff --git a/build.sh b/build.sh index d780aab..a53fe61 100755 --- a/build.sh +++ b/build.sh @@ -30,29 +30,8 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then . ../build/windows/rtf/make.sh yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci" - yarn gulp "vscode-win32-${VSCODE_ARCH}-inno-updater" - if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then - yarn gulp "vscode-win32-${VSCODE_ARCH}-archive" - fi - - if [[ "${SHOULD_BUILD_EXE_SYS}" != "no" ]]; then - yarn gulp "vscode-win32-${VSCODE_ARCH}-system-setup" - fi - - if [[ "${SHOULD_BUILD_EXE_USR}" != "no" ]]; then - yarn gulp "vscode-win32-${VSCODE_ARCH}-user-setup" - fi - - if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then - if [[ "${SHOULD_BUILD_MSI}" != "no" ]]; then - . ../build/windows/msi/build.sh - fi - - if [[ "${SHOULD_BUILD_MSI_NOUP}" != "no" ]]; then - . ../build/windows/msi/build-updates-disabled.sh - fi - else + if [[ "${VSCODE_ARCH}" != "ia32" && "${VSCODE_ARCH}" != "x64" ]]; then SHOULD_BUILD_REH="no" fi @@ -62,20 +41,6 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then find "../VSCode-linux-${VSCODE_ARCH}" -exec touch {} \; - if [[ "${SKIP_LINUX_PACKAGES}" != "True" ]]; then - if [[ "${SHOULD_BUILD_DEB}" != "no" || "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then - yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb" - fi - - if [[ "${SHOULD_BUILD_RPM}" != "no" ]]; then - yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm" - fi - - if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then - . ../build/linux/appimage/build.sh - fi - fi - VSCODE_PLATFORM="linux" fi diff --git a/build/build.sh b/build/build.sh index 98485ca..bbca3dd 100755 --- a/build/build.sh +++ b/build/build.sh @@ -4,10 +4,13 @@ # to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build.sh ### +export CI_BUILD=no +export SHOULD_BUILD=yes +export SKIP_PACKAGES="yes" export VSCODE_LATEST="no" export VSCODE_QUALITY="stable" -while getopts ":il" opt; do +while getopts ":ilp" opt; do case "$opt" in i) export VSCODE_QUALITY="insider" @@ -15,6 +18,9 @@ while getopts ":il" opt; do l) export VSCODE_LATEST="yes" ;; + p) + export SKIP_PACKAGES="no" + ;; esac done @@ -39,16 +45,20 @@ else fi echo "OS_NAME: ${OS_NAME}" +echo "SKIP_PACKAGES: ${SKIP_PACKAGES}" echo "VSCODE_ARCH: ${VSCODE_ARCH}" echo "VSCODE_LATEST: ${VSCODE_LATEST}" echo "VSCODE_QUALITY: ${VSCODE_QUALITY}" rm -rf vscode* VSCode* -if [[ "${OS_NAME}" == "windows" ]]; then - rm -rf build/windows/msi/releasedir -fi - . get_repo.sh +. build.sh -SHOULD_BUILD=yes CI_BUILD=no . build.sh +if [[ "${SKIP_PACKAGES}" == "no" ]]; then + if [[ "${OS_NAME}" == "windows" ]]; then + rm -rf build/windows/msi/releasedir + fi + + . prepare_artifacts.sh +fi diff --git a/prepare_artifacts.sh b/prepare_artifacts.sh index 89af9a7..c347494 100755 --- a/prepare_artifacts.sh +++ b/prepare_artifacts.sh @@ -15,6 +15,28 @@ sum_file() { mkdir artifacts if [[ "${OS_NAME}" == "osx" ]]; then + if [[ "${CI_BUILD}" != "no" ]]; then + cd "VSCode-darwin-${VSCODE_ARCH}" + + CERTIFICATE_P12=VSCodium.p12 + KEYCHAIN="${RUNNER_TEMP}/build.keychain" + + echo "${CERTIFICATE_OSX_P12}" | base64 --decode > "${CERTIFICATE_P12}" + security create-keychain -p mysecretpassword "${KEYCHAIN}" + security default-keychain -s "${KEYCHAIN}" + security unlock-keychain -p mysecretpassword "${KEYCHAIN}" + security import "${CERTIFICATE_P12}" -k "${KEYCHAIN}" -P "${CERTIFICATE_OSX_PASSWORD}" -T /usr/bin/codesign + security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword "${KEYCHAIN}" + + if [[ "${VSCODE_QUALITY}" == "insider" ]]; then + codesign --deep --force --verbose --sign "${CERTIFICATE_OSX_ID}" "VSCodium - Insiders.app" + else + codesign --deep --force --verbose --sign "${CERTIFICATE_OSX_ID}" "VSCodium.app" + fi + + cd .. + fi + if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then echo "Building and moving ZIP" cd "VSCode-darwin-${VSCODE_ARCH}" @@ -32,6 +54,34 @@ if [[ "${OS_NAME}" == "osx" ]]; then VSCODE_PLATFORM="darwin" elif [[ "${OS_NAME}" == "windows" ]]; then + cd vscode || { echo "'vscode' dir not found"; exit 1; } + + yarn gulp "vscode-win32-${VSCODE_ARCH}-inno-updater" + + if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then + yarn gulp "vscode-win32-${VSCODE_ARCH}-archive" + fi + + if [[ "${SHOULD_BUILD_EXE_SYS}" != "no" ]]; then + yarn gulp "vscode-win32-${VSCODE_ARCH}-system-setup" + fi + + if [[ "${SHOULD_BUILD_EXE_USR}" != "no" ]]; then + yarn gulp "vscode-win32-${VSCODE_ARCH}-user-setup" + fi + + if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then + if [[ "${SHOULD_BUILD_MSI}" != "no" ]]; then + . ../build/windows/msi/build.sh + fi + + if [[ "${SHOULD_BUILD_MSI_NOUP}" != "no" ]]; then + . ../build/windows/msi/build-updates-disabled.sh + fi + fi + + cd .. + if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then echo "Moving ZIP" mv "vscode\\.build\\win32-${VSCODE_ARCH}\\archive\\VSCode-win32-${VSCODE_ARCH}.zip" "artifacts\\VSCodium-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.zip" @@ -61,6 +111,22 @@ elif [[ "${OS_NAME}" == "windows" ]]; then VSCODE_PLATFORM="win32" else + cd vscode || { echo "'vscode' dir not found"; exit 1; } + + if [[ "${SHOULD_BUILD_DEB}" != "no" || "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then + yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb" + fi + + if [[ "${SHOULD_BUILD_RPM}" != "no" ]]; then + yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm" + fi + + if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then + . ../build/linux/appimage/build.sh + fi + + cd .. + if [[ "${SHOULD_BUILD_TAR}" != "no" ]]; then echo "Building and moving TAR" cd "VSCode-linux-${VSCODE_ARCH}" From 39af33e65a609a54f316a0f4fc65fc5f5c6ec428 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 29 Aug 2022 21:56:51 +0200 Subject: [PATCH 3/3] fix: generate artifacts (#1223) --- .gitignore | 1 + build/build.sh | 4 +-- build/build_docker.sh | 35 ++++++++++++++++++++--- build/linux/appimage/build.sh | 2 +- build/windows/msi/build.sh | 4 ++- build/windows/msi/i18n/vscodium.de-de.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.en-us.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.es-es.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.fr-fr.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.it-it.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.ja-jp.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.ko-kr.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.ru-ru.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.zh-cn.wxl | 18 ++++++------ build/windows/msi/i18n/vscodium.zh-tw.wxl | 18 ++++++------ prepare_artifacts.sh | 8 ++++-- 16 files changed, 133 insertions(+), 101 deletions(-) diff --git a/.gitignore b/.gitignore index 395da48..c5b9201 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ VS*/* VSCode* VSCodium* .DS_Store +artifacts/ build/linux/appimage/out build/linux/appimage/pkg2appimage.AppDir build/linux/appimage/pkg2appimage-*.AppImage diff --git a/build/build.sh b/build/build.sh index bbca3dd..a598789 100755 --- a/build/build.sh +++ b/build/build.sh @@ -4,8 +4,8 @@ # to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build.sh ### -export CI_BUILD=no -export SHOULD_BUILD=yes +export CI_BUILD="no" +export SHOULD_BUILD="yes" export SKIP_PACKAGES="yes" export VSCODE_LATEST="no" export VSCODE_QUALITY="stable" diff --git a/build/build_docker.sh b/build/build_docker.sh index 564558b..527880b 100755 --- a/build/build_docker.sh +++ b/build/build_docker.sh @@ -2,8 +2,26 @@ exists() { type -t "$1" > /dev/null 2>&1; } -rm -rf VSCode* -rm -rf vscode* +export CI_BUILD="no" +export OS_NAME="linux" +export SHOULD_BUILD="yes" +export SKIP_PACKAGES="yes" +export VSCODE_LATEST="no" +export VSCODE_QUALITY="stable" + +while getopts ":ilp" opt; do + case "$opt" in + i) + export VSCODE_QUALITY="insider" + ;; + l) + export VSCODE_LATEST="yes" + ;; + p) + export SKIP_PACKAGES="no" + ;; + esac +done if ! exists yarn; then curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - @@ -22,8 +40,17 @@ else export VSCODE_ARCH="armhf" fi -echo "-- VSCODE_ARCH: ${VSCODE_ARCH}" +echo "OS_NAME: ${OS_NAME}" +echo "SKIP_PACKAGES: ${SKIP_PACKAGES}" +echo "VSCODE_ARCH: ${VSCODE_ARCH}" +echo "VSCODE_LATEST: ${VSCODE_LATEST}" +echo "VSCODE_QUALITY: ${VSCODE_QUALITY}" + +rm -rf vscode* VSCode* . get_repo.sh +. build.sh -SHOULD_BUILD=yes CI_BUILD=no OS_NAME=linux . build.sh +if [[ "${SKIP_PACKAGES}" == "no" ]]; then + . prepare_artifacts.sh +fi diff --git a/build/linux/appimage/build.sh b/build/linux/appimage/build.sh index 365c09b..596e458 100755 --- a/build/linux/appimage/build.sh +++ b/build/linux/appimage/build.sh @@ -32,7 +32,7 @@ if [[ "${VSCODE_ARCH}" == "x64" ]]; then rm -f pkg2appimage-*.AppImage rm -rf pkg2appimage.AppDir - rm -rf VSCodium + rm -rf VSCodium* fi cd "${CALLER_DIR}" diff --git a/build/windows/msi/build.sh b/build/windows/msi/build.sh index c79abf4..2bc79c3 100644 --- a/build/windows/msi/build.sh +++ b/build/windows/msi/build.sh @@ -43,6 +43,8 @@ else export PLATFORM="${VSCODE_ARCH}" fi +sed -i "s|@@PRODUCT_NAME@@|${PRODUCT_NAME}|g" .\\i18n\\*.wsl + BuildSetupTranslationTransform() { local CULTURE=${1} local LANGID=${2} @@ -67,7 +69,7 @@ BuildSetupTranslationTransform() { "${WIX}bin\\heat.exe" dir "${BINARY_DIR}" -out "Files-${OUTPUT_BASE_FILENAME}.wxs" -t vscodium.xsl -gg -sfrag -scom -sreg -srd -ke -cg "AppFiles" -var var.AppName -var var.ProductVersion -var var.IconDir -var var.LicenseDir -var var.BinaryDir -dr APPLICATIONFOLDER -platform "${PLATFORM}" "${WIX}bin\\candle.exe" -arch "${PLATFORM}" vscodium.wxs "Files-${OUTPUT_BASE_FILENAME}.wxs" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -dAppName="${PRODUCT_NAME}" -dProductVersion="${RELEASE_VERSION%-insider}" -dProductId="${PRODUCT_ID}" -dBinaryDir="${BINARY_DIR}" -dIconDir="${ICON_DIR}" -dLicenseDir="${LICENSE_DIR}" -dSetupResourcesDir="${SETUP_RESOURCES_DIR}" -dCulture="${CULTURE}" -"${WIX}bin\\light.exe" vscodium.wixobj "Files-${OUTPUT_BASE_FILENAME}.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -spdb -cc "${TEMP}\\vscodium-cab-cache\\${PLATFORM}" -out "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi" -loc "i18n\\${PRODUCT_SKU}.${CULTURE}.wxl" -cultures:"${CULTURE}" -sice:ICE60 -sice:ICE69 +"${WIX}bin\\light.exe" vscodium.wixobj "Files-${OUTPUT_BASE_FILENAME}.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -spdb -cc "${TEMP}\\vscodium-cab-cache\\${PLATFORM}" -out "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi" -loc "i18n\\vscodium.${CULTURE}.wxl" -cultures:"${CULTURE}" -sice:ICE60 -sice:ICE69 BuildSetupTranslationTransform de-de 1031 BuildSetupTranslationTransform es-es 3082 diff --git a/build/windows/msi/i18n/vscodium.de-de.wxl b/build/windows/msi/i18n/vscodium.de-de.wxl index b33bdd0..ca92126 100644 --- a/build/windows/msi/i18n/vscodium.de-de.wxl +++ b/build/windows/msi/i18n/vscodium.de-de.wxl @@ -1,25 +1,25 @@  1031 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Paket mit VSCodium + Paket mit @@PRODUCT_NAME@@ Startmenü-Verknüpfung Startmenü-Symbol erstellen. Desktop-Verknüpfung Desktop-Symbol erstellen. Dateizuordnungen - VSCodium als Editor für unterstützte Dateitypen registrieren. + @@PRODUCT_NAME@@ als Editor für unterstützte Dateitypen registrieren. Dateikontextmenü - Aktion "Mit VSCodium öffnen" dem Dateikontextmenü von Windows-Explorer hinzufügen. + Aktion "Mit @@PRODUCT_NAME@@ öffnen" dem Dateikontextmenü von Windows-Explorer hinzufügen. Verzeichniskontextmenü - Aktion "Mit VSCodium öffnen" dem Verzeichniskontextmenü von Windows-Explorer hinzufügen. + Aktion "Mit @@PRODUCT_NAME@@ öffnen" dem Verzeichniskontextmenü von Windows-Explorer hinzufügen. Zu PATH hinzufügen - VSCodium zur PATH Variable hinzufügen. Nach dem Neustart verfügbar. - VSCodium ausführen - Eine neuere Version von VSCodium ist bereits installiert. + @@PRODUCT_NAME@@ zur PATH Variable hinzufügen. Nach dem Neustart verfügbar. + @@PRODUCT_NAME@@ ausführen + Eine neuere Version von @@PRODUCT_NAME@@ ist bereits installiert. Diese Anwendung erfordert .NET Framework 4.5.2 oder höher. Bitte installieren Sie .NET Framework und führen Sie dieses Installationsprogramm erneut aus. Windows 7 oder neuer ist erforderlich. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.en-us.wxl b/build/windows/msi/i18n/vscodium.en-us.wxl index 6456bf6..24303fa 100644 --- a/build/windows/msi/i18n/vscodium.en-us.wxl +++ b/build/windows/msi/i18n/vscodium.en-us.wxl @@ -1,25 +1,25 @@  1033 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.es-es.wxl b/build/windows/msi/i18n/vscodium.es-es.wxl index a6eaa9e..af84628 100644 --- a/build/windows/msi/i18n/vscodium.es-es.wxl +++ b/build/windows/msi/i18n/vscodium.es-es.wxl @@ -1,25 +1,25 @@  3082 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.fr-fr.wxl b/build/windows/msi/i18n/vscodium.fr-fr.wxl index ba46b09..5f89947 100644 --- a/build/windows/msi/i18n/vscodium.fr-fr.wxl +++ b/build/windows/msi/i18n/vscodium.fr-fr.wxl @@ -1,25 +1,25 @@  1036 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.it-it.wxl b/build/windows/msi/i18n/vscodium.it-it.wxl index 201e11a..f1b9f29 100644 --- a/build/windows/msi/i18n/vscodium.it-it.wxl +++ b/build/windows/msi/i18n/vscodium.it-it.wxl @@ -1,25 +1,25 @@  1040 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.ja-jp.wxl b/build/windows/msi/i18n/vscodium.ja-jp.wxl index 9e127ad..42175b9 100644 --- a/build/windows/msi/i18n/vscodium.ja-jp.wxl +++ b/build/windows/msi/i18n/vscodium.ja-jp.wxl @@ -1,25 +1,25 @@  1041 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.ko-kr.wxl b/build/windows/msi/i18n/vscodium.ko-kr.wxl index 1c7121c..d665d0b 100644 --- a/build/windows/msi/i18n/vscodium.ko-kr.wxl +++ b/build/windows/msi/i18n/vscodium.ko-kr.wxl @@ -1,25 +1,25 @@  1042 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.ru-ru.wxl b/build/windows/msi/i18n/vscodium.ru-ru.wxl index 1668fa2..6e3dcf4 100644 --- a/build/windows/msi/i18n/vscodium.ru-ru.wxl +++ b/build/windows/msi/i18n/vscodium.ru-ru.wxl @@ -1,25 +1,25 @@  1049 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.zh-cn.wxl b/build/windows/msi/i18n/vscodium.zh-cn.wxl index ff4714b..c5fab3a 100644 --- a/build/windows/msi/i18n/vscodium.zh-cn.wxl +++ b/build/windows/msi/i18n/vscodium.zh-cn.wxl @@ -1,25 +1,25 @@  2052 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/build/windows/msi/i18n/vscodium.zh-tw.wxl b/build/windows/msi/i18n/vscodium.zh-tw.wxl index 78e1b9d..a218f51 100644 --- a/build/windows/msi/i18n/vscodium.zh-tw.wxl +++ b/build/windows/msi/i18n/vscodium.zh-tw.wxl @@ -1,25 +1,25 @@  1028 - VSCodium + @@PRODUCT_NAME@@ https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium https://github.com/VSCodium/vscodium - Package with VSCodium + Package with @@PRODUCT_NAME@@ Start Menu shortcut Create a start menu icon. Desktop shortcut Create a desktop icon. File Associations - Register VSCodium as an editor for supported file types. + Register @@PRODUCT_NAME@@ as an editor for supported file types. Files context menu - Add "Open with VSCodium" action to Windows Explorer file contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer file contect menu. Directory context menu - Add "Open with VSCodium" action to Windows Explorer directory contect menu. + Add "Open with @@PRODUCT_NAME@@" action to Windows Explorer directory contect menu. Add to PATH - Add VSCodium to PATH environment variable. Available after restart. - Launch VSCodium - Newer version of VSCodium is already installed. + Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart. + Launch @@PRODUCT_NAME@@ + Newer version of @@PRODUCT_NAME@@ is already installed. This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again. Windows 7 or later is required. - \ No newline at end of file + diff --git a/prepare_artifacts.sh b/prepare_artifacts.sh index c347494..eb6775e 100755 --- a/prepare_artifacts.sh +++ b/prepare_artifacts.sh @@ -12,7 +12,7 @@ sum_file() { fi } -mkdir artifacts +mkdir -p artifacts if [[ "${OS_NAME}" == "osx" ]]; then if [[ "${CI_BUILD}" != "no" ]]; then @@ -47,8 +47,8 @@ if [[ "${OS_NAME}" == "osx" ]]; then if [[ "${SHOULD_BUILD_DMG}" != "no" ]]; then echo "Building and moving DMG" pushd "VSCode-darwin-${VSCODE_ARCH}" - npx create-dmg VSCodium.app .. - mv "../VSCodium ${MS_TAG}.dmg" "../artifacts/VSCodium.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg" + npx create-dmg ./*.app .. + mv ../*.dmg "../artifacts/VSCodium.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg" popd fi @@ -147,6 +147,8 @@ else if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then echo "Moving AppImage" mv build/linux/appimage/out/*.AppImage* artifacts/ + + rename '_-_' '-' artifacts/*.AppImage fi VSCODE_PLATFORM="linux"