Compare commits

..

5 Commits

Author SHA1 Message Date
Peter Squicciarini
e0c124d19e Update README.md 2020-12-14 17:21:25 -08:00
Peter Squicciarini
2b1a4ff693 Merge pull request #586 from stripedpajamas/fix-macos-build 2020-12-14 16:28:36 -08:00
Peter Squicciarini
05819c1f79 Update signing to use new path 2020-12-14 14:53:43 -08:00
Peter Squicciarini
4782bb2ead Update other places Darwin arch is mentioned 2020-12-14 14:22:48 -08:00
Peter Squicciarini
3909371fa4 Include arch in Darwin build task 2020-12-14 12:35:53 -08:00
3 changed files with 9 additions and 8 deletions

View File

@@ -12,6 +12,7 @@ jobs:
runs-on: macOS-latest
env:
OS_NAME: "osx"
VSCODE_ARCH: "x64"
steps:
- uses: actions/checkout@v2
@@ -43,8 +44,8 @@ jobs:
CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
if: env.SHOULD_BUILD == 'yes'
run: |
if [ -d "VSCode-darwin" ]; then # just in case the build failed
cd VSCode-darwin
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=build.keychain
@@ -58,15 +59,15 @@ jobs:
- name: Zip release
run: |
cd VSCode-darwin
zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
cd "VSCode-darwin-${VSCODE_ARCH}"
zip -r -X -y ../VSCodium-darwin-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip ./*.app
if: env.SHOULD_BUILD == 'yes'
- name: DMG the release
run: |
pushd VSCode-darwin
pushd "VSCode-darwin-${VSCODE_ARCH}"
npx create-dmg VSCodium.app ..
mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${LATEST_MS_TAG}.dmg"
mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${VSCODE_ARCH}.${LATEST_MS_TAG}.dmg"
popd
if: env.SHOULD_BUILD == 'yes'

View File

@@ -88,7 +88,7 @@ flatpak run com.vscodium.codium
## <a id="why"></a>Why Does This Exist
This repository contains build files to generate free release binaries of Microsoft's VSCode. When we speak of "free software", we're talking about freedom, not price.
Microsoft's downloads of Visual Studio Code are licensed under [this not-FLOSS license](https://code.visualstudio.com/license) and contain telemetry/tracking. According to [this comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) from a Visual Studio Code maintainer:
Microsoft's releases of Visual Studio Code are licensed under [this not-FLOSS license](https://code.visualstudio.com/license) and contain telemetry/tracking. According to [this comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) from a Visual Studio Code maintainer:
> When we [Microsoft] build Visual Studio Code, we do exactly this. We clone the vscode repository, we lay down a customized product.json that has Microsoft specific functionality (telemetry, gallery, logo, etc.), and then produce a build that we release under our license.
>

View File

@@ -26,7 +26,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
yarn gulp minify-vscode
if [[ "$OS_NAME" == "osx" ]]; then
yarn gulp vscode-darwin-min-ci
yarn gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
elif [[ "$CI_WINDOWS" == "True" ]]; then
cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
yarn gulp "vscode-win32-${BUILDARCH}-min-ci"