Merge pull request #5335 from ethereum/linuxbuild

add linux desktop build & test  to all branches
pull/5324/head
bunsenstraat 4 weeks ago committed by GitHub
commit 047855e6be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 26
      .circleci/config.yml
  2. 37
      apps/remixdesktop/rundist.bash
  3. 60
      apps/remixdesktop/test_only.json

@ -111,7 +111,7 @@ jobs:
resource_class: resource_class:
xlarge xlarge
working_directory: ~/remix-project working_directory: ~/remix-project
parallelism: 10 parallelism: 15
steps: steps:
- run: ldd --version - run: ldd --version
- checkout - checkout
@ -132,7 +132,7 @@ jobs:
yarn add node-pty yarn add node-pty
yarn --ignore-optional yarn --ignore-optional
yarn add @remix-project/remix-ws-templates yarn add @remix-project/remix-ws-templates
./rundist.bash ./rundist.bash test_only
- run: - run:
name: "Run tests" name: "Run tests"
command: | command: |
@ -785,34 +785,46 @@ workflows:
unless: << pipeline.parameters.run_flaky_tests >> unless: << pipeline.parameters.run_flaky_tests >>
jobs: jobs:
- build - build
- build-desktop: - build-desktop
filters:
branches:
only: [/.*desktop.*/, 'remix_beta']
- build-remixdesktop-mac: - build-remixdesktop-mac:
requires: requires:
- build-desktop - build-desktop
matrix: matrix:
parameters: parameters:
arch: ["arm64", "x64"] arch: ["arm64", "x64"]
filters:
branches:
only: [/.*desktop.*/]
- test-remixdesktop-mac: - test-remixdesktop-mac:
requires: requires:
- build-desktop - build-desktop
filters:
branches:
only: [/.*desktop.*/]
- build-remixdesktop-windows: - build-remixdesktop-windows:
requires: requires:
- build-desktop - build-desktop
filters:
branches:
only: [/.*desktop.*/]
- sign-remixdesktop-windows: - sign-remixdesktop-windows:
requires: requires:
- build-remixdesktop-windows - build-remixdesktop-windows
- build-remixdesktop-linux: - build-remixdesktop-linux:
requires: requires:
- build-desktop - build-desktop
filters:
branches:
only: [/.*desktop.*/]
- test-remixdesktop-linux: - test-remixdesktop-linux:
requires: requires:
- build-desktop - build-desktop
- test-remixdesktop-windows: - test-remixdesktop-windows:
requires: requires:
- build-desktop - build-desktop
filters:
branches:
only: [/.*desktop.*/]
- uploadartifacts: - uploadartifacts:
requires: requires:
- build-remixdesktop-mac - build-remixdesktop-mac
@ -823,7 +835,7 @@ workflows:
- test-remixdesktop-mac - test-remixdesktop-mac
filters: filters:
branches: branches:
only: [/.*desktop.*/] only: [/.*desktop-master.*/]
- build-plugin: - build-plugin:
matrix: matrix:
parameters: parameters:

@ -3,20 +3,37 @@
# Read the version from package.json # Read the version from package.json
version=$(awk -F'"' '/"version":/ {print $4}' package.json) version=$(awk -F'"' '/"version":/ {print $4}' package.json)
# Determine the command to run based on the version # Default to false for test_only
if [[ $version == *"beta"* ]]; then test_only=false
command="yarn dist -c beta.json"
elif [[ $version == *"alpha"* ]]; then # Check for test_only argument
command="yarn dist -c alpha.json" for arg in "$@"; do
elif [[ $version == *"insiders"* ]]; then if [[ $arg == "test_only" ]]; then
command="yarn dist -c insiders.json" test_only=true
break
fi
done
# Determine the command to run based on the version and test_only flag
if [ "$test_only" = true ]; then
command="yarn dist -c test_only.json"
else else
command="yarn dist -c latest.json" if [[ $version == *"beta"* ]]; then
command="yarn dist -c beta.json"
elif [[ $version == *"alpha"* ]]; then
command="yarn dist -c alpha.json"
elif [[ $version == *"insiders"* ]]; then
command="yarn dist -c insiders.json"
else
command="yarn dist -c latest.json"
fi
fi fi
# Append any arguments passed in CLI # Append any remaining arguments passed in CLI (except test_only)
for arg in "$@"; do for arg in "$@"; do
command+=" $arg" if [[ $arg != "test_only" ]]; then
command+=" $arg"
fi
done done
# Print and run the command # Print and run the command

@ -0,0 +1,60 @@
{
"productName": "Remix-Desktop-Insiders",
"appId": "org.ethereum.remix-ide",
"asar": true,
"generateUpdatesFilesForAllChannels": false,
"icon": "assets",
"files": [
"build/**/*",
"node_modules/node-pty/**/*"
],
"afterSign": "aftersign.js",
"afterAllArtifactBuild": "afterbuild.js",
"publish": [
{
"provider": "github",
"owner": "remix-project-org",
"repo": "remix-desktop-insiders",
"releaseType": "draft",
"publishAutoUpdate": true
}
],
"mac": {
"category": "public.app-category.productivity",
"icon": "assets/icon.png",
"darkModeSupport": true,
"hardenedRuntime": true,
"gatekeeperAssess": false,
"entitlements": "entitlements.mac.plist",
"entitlementsInherit": "entitlements.mac.plist"
},
"dmg": {
"writeUpdateInfo": true,
"sign": true
},
"nsis": {
"createDesktopShortcut": "always",
"allowToChangeInstallationDirectory": true,
"oneClick": false,
"shortcutName": "Remix Desktop Insiders",
"differentialPackage": false
},
"win": {
"target": [
"nsis"
],
"artifactName": "Remix-Desktop-Setup-${version}.${ext}",
"icon": "assets/icon.png"
},
"deb": {},
"linux": {
"target": [
"dir"
],
"category": "WebBrowser",
"icon": "assets"
},
"directories": {
"output": "release"
}
}
Loading…
Cancel
Save