Parker2991/vscodium
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(macos): clean keychain only after dmg [skip ci]

Browse source
This commit is contained in:
Baptiste Augrain 2024-06-04 11:00:07 +02:00
parent c3064a2cb3
commit b5bbda7208
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
prepare_assets.sh
View file

@ -71,11 +71,6 @@ if [[ "${OS_NAME}" == "osx" ]]; then
xcrun stapler staple ./*.app xcrun stapler staple ./*.app
# spctl --assess -vv --type install ./*.app # spctl --assess -vv --type install ./*.app
echo "+ clean"
security delete-keychain "${KEYCHAIN}"
# shellcheck disable=SC2086
security list-keychains -s $KEYCHAINS
rm "${ZIP_FILE}" rm "${ZIP_FILE}"
cd .. cd ..
@ -91,8 +86,8 @@ if [[ "${OS_NAME}" == "osx" ]]; then
if [[ "${SHOULD_BUILD_DMG}" != "no" ]]; then if [[ "${SHOULD_BUILD_DMG}" != "no" ]]; then
echo "Building and moving DMG" echo "Building and moving DMG"
pushd "VSCode-darwin-${VSCODE_ARCH}" pushd "VSCode-darwin-${VSCODE_ARCH}"
npx create-dmg ./*.app .. npx create-dmg ./*.app .
mv ../*.dmg "../assets/${APP_NAME}.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg" mv ./*.dmg "../assets/${APP_NAME}.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg"
popd popd
fi fi
@ -101,6 +96,13 @@ if [[ "${OS_NAME}" == "osx" ]]; then
git archive --format zip --output="./assets/${APP_NAME}-${RELEASE_VERSION}-src.zip" HEAD git archive --format zip --output="./assets/${APP_NAME}-${RELEASE_VERSION}-src.zip" HEAD
fi fi
if [[ -n "${CERTIFICATE_OSX_P12_DATA}" ]]; then
echo "+ clean"
security delete-keychain "${KEYCHAIN}"
# shellcheck disable=SC2086
security list-keychains -s $KEYCHAINS
fi
VSCODE_PLATFORM="darwin" VSCODE_PLATFORM="darwin"
elif [[ "${OS_NAME}" == "windows" ]]; then elif [[ "${OS_NAME}" == "windows" ]]; then
cd vscode || { echo "'vscode' dir not found"; exit 1; } cd vscode || { echo "'vscode' dir not found"; exit 1; }