From f8eeb2b698142e4d7a338e262aa2158c12825104 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 10 Mar 2021 16:04:07 +0100 Subject: [PATCH] - fixing build - add manual build --- build_macos.sh | 10 ++++++++++ get_repo.sh | 7 ++++--- patches/fix-rpm-spec.patch | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100755 build_macos.sh diff --git a/build_macos.sh b/build_macos.sh new file mode 100755 index 0000000..55cc5ee --- /dev/null +++ b/build_macos.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +nvm use 12 + +rm -rf VSCode* +rm -rf vscode + +. get_repo.sh + +SHOULD_BUILD=yes CI_BUILD=no OS_NAME=osx VSCODE_ARCH=x64 . build.sh \ No newline at end of file diff --git a/get_repo.sh b/get_repo.sh index 8651058..301efdf 100755 --- a/get_repo.sh +++ b/get_repo.sh @@ -9,6 +9,7 @@ echo "Got the latest MS tag: ${LATEST_MS_TAG}" git clone https://github.com/Microsoft/vscode.git --branch $LATEST_MS_TAG --depth 1 # for GH actions -echo "LATEST_MS_COMMIT=$LATEST_MS_COMMIT" >> $GITHUB_ENV -echo "LATEST_MS_TAG=$LATEST_MS_TAG" >> $GITHUB_ENV - +if [[ $GITHUB_ENV ]]; then + echo "LATEST_MS_COMMIT=$LATEST_MS_COMMIT" >> $GITHUB_ENV + echo "LATEST_MS_TAG=$LATEST_MS_TAG" >> $GITHUB_ENV +fi diff --git a/patches/fix-rpm-spec.patch b/patches/fix-rpm-spec.patch index 27747ce..c0f2135 100644 --- a/patches/fix-rpm-spec.patch +++ b/patches/fix-rpm-spec.patch @@ -13,4 +13,4 @@ /usr/share/bash-completion/completions/@@NAME@@ /usr/share/zsh/site-functions/_@@NAME@@ + -++%config(noreplace) /usr/share/@@NAME@@/resources/app/product.json ++%config(noreplace) /usr/share/@@NAME@@/resources/app/product.json