self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

fix(ci): checking with binary path before copying as extraResources

Browse Source
This commit is contained in:
palerdot 2023-04-05 11:38:24 +05:30
parent 841a9c6e09
commit b6a53f96f7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/scripts/run_ci.sh vendored
View File

@ -4,7 +4,7 @@
# Setup environment variables
# =============================================================================
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
ROOT_DIR="$SCRIPT_DIR/../.."
IS_PULL_REQUEST=0
@ -47,9 +47,9 @@ echo "IS_DEV_BRANCH=$IS_DEV_BRANCH"
echo "IS_LINUX=$IS_LINUX"
echo "IS_MACOS=$IS_MACOS"
echo "Node $( node -v )"
echo "Npm $( npm -v )"
echo "Yarn $( yarn -v )"
echo "Node $(node -v)"
echo "Npm $(npm -v)"
echo "Yarn $(yarn -v)"
# =============================================================================
# Install packages
@ -189,7 +189,7 @@ elif [[ $IS_LINUX = 1 ]] && [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
cd "$ROOT_DIR"
yarn run buildServerDocker --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
else
echo "Step: Building default plugins for CI check"
echo "Step: Bundling default plugins for CI check"
cd "$ROOT_DIR/packages/tools"
node bundleDefaultPlugins.js
echo "Step: Building but *not* publishing desktop application..."

4
packages/app-desktop/package.json
View File

@ -92,8 +92,8 @@
]
},
"binaries": [
"Contents/Resources/build/defaultPlugins/io.github.jackgruber.backup/plugin.jpl/7zip-bin/mac/x64/7za",
"Contents/Resources/build/defaultPlugins/io.github.jackgruber.backup/plugin.jpl/7zip-bin/mac/arm64/7za"
"build/defaultPlugins/io.github.jackgruber.backup/plugin.jpl/7zip-bin/mac/x64/7za",
"build/defaultPlugins/io.github.jackgruber.backup/plugin.jpl/7zip-bin/mac/arm64/7za"
]
},
"linux": {