diff --git a/.circleci/config.yml b/.circleci/config.yml index 26bb163e27..a02ab093d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -111,7 +111,7 @@ jobs: resource_class: xlarge working_directory: ~/remix-project - parallelism: 10 + parallelism: 15 steps: - run: ldd --version - checkout @@ -132,7 +132,7 @@ jobs: yarn add node-pty yarn --ignore-optional yarn add @remix-project/remix-ws-templates - ./rundist.bash + ./rundist.bash test_only - run: name: "Run tests" command: | @@ -785,34 +785,46 @@ workflows: unless: << pipeline.parameters.run_flaky_tests >> jobs: - build - - build-desktop: - filters: - branches: - only: [/.*desktop.*/, 'remix_beta'] + - build-desktop - build-remixdesktop-mac: requires: - build-desktop matrix: parameters: arch: ["arm64", "x64"] + filters: + branches: + only: [/.*desktop.*/] - test-remixdesktop-mac: requires: - build-desktop + filters: + branches: + only: [/.*desktop.*/] - build-remixdesktop-windows: requires: - build-desktop + filters: + branches: + only: [/.*desktop.*/] - sign-remixdesktop-windows: requires: - build-remixdesktop-windows - build-remixdesktop-linux: requires: - build-desktop + filters: + branches: + only: [/.*desktop.*/] - test-remixdesktop-linux: requires: - build-desktop - test-remixdesktop-windows: requires: - build-desktop + filters: + branches: + only: [/.*desktop.*/] - uploadartifacts: requires: - build-remixdesktop-mac @@ -823,7 +835,7 @@ workflows: - test-remixdesktop-mac filters: branches: - only: [/.*desktop.*/] + only: [/.*desktop-master.*/] - build-plugin: matrix: parameters: diff --git a/apps/remixdesktop/rundist.bash b/apps/remixdesktop/rundist.bash index 66a3a9a0dc..37d7d329cf 100755 --- a/apps/remixdesktop/rundist.bash +++ b/apps/remixdesktop/rundist.bash @@ -3,20 +3,37 @@ # Read the version from package.json version=$(awk -F'"' '/"version":/ {print $4}' package.json) -# Determine the command to run based on the version -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" +# Default to false for test_only +test_only=false + +# Check for test_only argument +for arg in "$@"; do + if [[ $arg == "test_only" ]]; then + 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 - 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 -# Append any arguments passed in CLI +# Append any remaining arguments passed in CLI (except test_only) for arg in "$@"; do - command+=" $arg" + if [[ $arg != "test_only" ]]; then + command+=" $arg" + fi done # Print and run the command diff --git a/apps/remixdesktop/test_only.json b/apps/remixdesktop/test_only.json new file mode 100644 index 0000000000..2214196338 --- /dev/null +++ b/apps/remixdesktop/test_only.json @@ -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" + } +} \ No newline at end of file