diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8af867b5..a0671a2a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: with: node-version: "20.11" - name: Download binary - run: mkdir electron/bins && curl -L -o electron/bins/pearl https://tempfileserver.staging.autonolas.tech/pearl && chmod +x electron/bins/pearl + run: mkdir electron/bins && curl -L -o electron/bins/pearl_arm64 https://tempfileserver.staging.autonolas.tech/pearl_arm64 && chmod +x electron/bins/pearl_arm64 - uses: snok/install-poetry@v1 with: version: "1.7.1" diff --git a/electron/install.js b/electron/install.js index 5d216df1..5cff51cc 100644 --- a/electron/install.js +++ b/electron/install.js @@ -16,14 +16,14 @@ const { BrewScript } = require('./scripts'); * - use "" (nothing as a suffix) for latest release candidate, for example "0.1.0rc26" * - use "alpha" for alpha release, for example "0.1.0rc26-alpha" */ -const OlasMiddlewareVersion = '0.1.0rc50'; +const OlasMiddlewareVersion = '0.1.0rc51'; const OperateDirectory = `${os.homedir()}/.operate`; const VenvDir = `${OperateDirectory}/venv`; const TempDir = `${OperateDirectory}/temp`; const VersionFile = `${OperateDirectory}/version.txt`; const LogFile = `${OperateDirectory}/logs.txt`; const OperateInstallationLog = `${os.homedir()}/operate.log`; -const OperateCmd = `${__dirname}/bins/pearl`; +const OperateCmd = `${__dirname}/bins/pearl_${process.arch}`; const Env = { ...process.env, PATH: `${process.env.PATH}:/opt/homebrew/bin:/usr/local/bin`, @@ -336,57 +336,57 @@ function removeInstallationLogFile() { /*******************************/ async function setupDarwin(ipcChannel) { - removeInstallationLogFile(); - console.log(appendLog('Checking brew installation')); - if (!isBrewInstalled()) { - ipcChannel.send('response', 'Installing Pearl Daemon'); - console.log(appendLog('Installing brew')); - await installBrew(); - } - - console.log(appendLog('Checking python installation')); - if (!isPythonInstalledDarwin()) { - ipcChannel.send('response', 'Installing Pearl Daemon'); - console.log(appendLog('Installing python')); - installPythonDarwin(); - } - - console.log(appendLog('Creating required directories')); - await createDirectory(`${OperateDirectory}`); - await createDirectory(`${OperateDirectory}/temp`); - - console.log(appendLog('Checking tendermint installation')); - if (!isTendermintInstalledUnix()) { - ipcChannel.send('response', 'Installing Pearl Daemon'); - console.log(appendLog('Installing tendermint')); - await installTendermintUnix(); - } - - if (!fs.existsSync(VenvDir)) { - ipcChannel.send('response', 'Installing Pearl Daemon'); - console.log(appendLog('Creating virtual environment')); - createVirtualEnvUnix(VenvDir); - - console.log(appendLog('Installing pearl backend')); - installOperatePackageUnix(OperateDirectory); - } - - console.log(appendLog('Checking if upgrade is required')); - if (versionBumpRequired()) { - console.log( - appendLog(`Upgrading pearl daemon to ${OlasMiddlewareVersion}`), - ); - reInstallOperatePackageUnix(OperateDirectory); - writeVersion(); - removeLogFile(); - } - - if (!fs.existsSync(`${OperateDirectory}/venv/bin/operate`)) { - reInstallOperatePackageUnix(OperateDirectory); - } - - console.log(appendLog('Installing pearl CLI')); - await installOperateCli('/opt/homebrew/bin/operate'); + // removeInstallationLogFile(); + // console.log(appendLog('Checking brew installation')); + // if (!isBrewInstalled()) { + // ipcChannel.send('response', 'Installing Pearl Daemon'); + // console.log(appendLog('Installing brew')); + // await installBrew(); + // } + // + // console.log(appendLog('Checking python installation')); + // if (!isPythonInstalledDarwin()) { + // ipcChannel.send('response', 'Installing Pearl Daemon'); + // console.log(appendLog('Installing python')); + // installPythonDarwin(); + // } + // + // console.log(appendLog('Creating required directories')); + // await createDirectory(`${OperateDirectory}`); + // await createDirectory(`${OperateDirectory}/temp`); + // + // console.log(appendLog('Checking tendermint installation')); + // if (!isTendermintInstalledUnix()) { + // ipcChannel.send('response', 'Installing Pearl Daemon'); + // console.log(appendLog('Installing tendermint')); + // await installTendermintUnix(); + // } + // + // if (!fs.existsSync(VenvDir)) { + // ipcChannel.send('response', 'Installing Pearl Daemon'); + // console.log(appendLog('Creating virtual environment')); + // createVirtualEnvUnix(VenvDir); + // + // console.log(appendLog('Installing pearl backend')); + // installOperatePackageUnix(OperateDirectory); + // } + // + // console.log(appendLog('Checking if upgrade is required')); + // if (versionBumpRequired()) { + // console.log( + // appendLog(`Upgrading pearl daemon to ${OlasMiddlewareVersion}`), + // ); + // reInstallOperatePackageUnix(OperateDirectory); + // writeVersion(); + // removeLogFile(); + // } + // + // if (!fs.existsSync(`${OperateDirectory}/venv/bin/operate`)) { + // reInstallOperatePackageUnix(OperateDirectory); + // } + // + // console.log(appendLog('Installing pearl CLI')); + // await installOperateCli('/opt/homebrew/bin/operate'); } // TODO: Add Tendermint installation diff --git a/package.json b/package.json index 7a22390d..a05c2fb5 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "main": "electron/main.js", "name": "olas-operate-app", "productName": "Pearl", - "version": "0.1.0-rc50", + "version": "0.1.0-rc51", "dependencies": { "@ant-design/cssinjs": "^1.18.4", "@ant-design/icons": "^5.3.0", diff --git a/pyproject.toml b/pyproject.toml index d4a43b32..68aab958 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "olas-operate-middleware" -version = "0.1.0-rc49" +version = "0.1.0-rc51" description = "" authors = ["David Vilela ", "Viraj Patel "] readme = "README.md"