From 081b02bafecb509e38aceeffd75d860f9582d443 Mon Sep 17 00:00:00 2001 From: Ardian Date: Fri, 9 Aug 2024 13:22:27 +0200 Subject: [PATCH 1/2] fix: intel build --- .github/workflows/release.yml | 22 +++++++++++++++------- templates/trader.yaml | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7187504d4..044325707 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,10 +11,10 @@ on: jobs: build-macos-pyinstaller: - runs-on: macos-latest + runs-on: ${{ matrix.os }} strategy: matrix: - arch: [ x64, arm64 ] + os: [ macos-14, macos-14-large ] steps: - uses: actions/checkout@v3 @@ -34,22 +34,30 @@ jobs: - name: Install dependencies run: poetry install + - name: Set arch environment variable for macos-latest-large + if: contains(matrix.os, 'large') + run: echo "OS_ARCH=x64" >> $GITHUB_ENV + + - name: Set arch environment variable for other macOS versions + if: ${{ !contains(matrix.os, 'large') }} + run: echo "OS_ARCH=arm64" >> $GITHUB_ENV + - name: Get trader bin run: | - trader_version=$(poetry run python -c "import yaml; config = yaml.safe_load(open('templates/trader.yaml')); print(config['configuration']['trader_version'])") + trader_version=$(poetry run python -c "import yaml; config = yaml.safe_load(open('templates/trader.yaml')); print(config['trader_version'])") echo $trader_version - mkdir dist && curl -L -o dist/aea_bin "https://github.com/valory-xyz/trader/releases/download/${trader_version}/trader_bin_${{ matrix.arch }}" + mkdir dist && curl -L -o dist/aea_bin "https://github.com/valory-xyz/trader/releases/download/${trader_version}/trader_bin_${{ env.OS_ARCH }}" - name: Build with PyInstaller run: | poetry run pyinstaller operate/services/utils/tendermint.py --onefile - poetry run pyinstaller --collect-data eth_account --collect-all aea --collect-all autonomy --collect-all operate --collect-all aea_ledger_ethereum --collect-all aea_ledger_cosmos --collect-all aea_ledger_ethereum_flashbots --hidden-import aea_ledger_ethereum --hidden-import aea_ledger_cosmos --hidden-import aea_ledger_ethereum_flashbots operate/pearl.py --add-binary dist/aea_bin:. --add-binary dist/tendermint:. --onefile --name pearl_${{ matrix.arch }} + poetry run pyinstaller --collect-data eth_account --collect-all aea --collect-all autonomy --collect-all operate --collect-all aea_ledger_ethereum --collect-all aea_ledger_cosmos --collect-all aea_ledger_ethereum_flashbots --hidden-import aea_ledger_ethereum --hidden-import aea_ledger_cosmos --hidden-import aea_ledger_ethereum_flashbots operate/pearl.py --add-binary dist/aea_bin:. --add-binary dist/tendermint:. --onefile --name pearl_${{ env.OS_ARCH }} - name: Upload Release Assets uses: actions/upload-artifact@v2 with: - name: pearl_${{ matrix.arch }} - path: dist/pearl_${{ matrix.arch }} + name: pearl_${{ env.OS_ARCH }} + path: dist/pearl_${{ env.OS_ARCH }} release-operate: runs-on: macos-latest diff --git a/templates/trader.yaml b/templates/trader.yaml index f59a98e11..63a87f47c 100644 --- a/templates/trader.yaml +++ b/templates/trader.yaml @@ -2,8 +2,8 @@ name: "Trader Agent" description: "A single-agent service (sovereign agent) placing bets on Omen" hash: bafybeidgjgjj5ul6xkubicbemppufgsbx5sr5rwhtrwttk2oivp5bkdnce image: https://operate.olas.network/_next/image?url=%2Fimages%2Fprediction-agent.png&w=3840&q=75 +trader_version: v0.18.1 configuration: - trader_version: v0.16.4 nft: bafybeig64atqaladigoc3ds4arltdu63wkdrk3gesjfvnfdmz35amv7faq rpc: http://localhost:8545 # User provided agent_id: 14 From 043dc1fa65afd2335fd9b8adb46e67bd4596882d Mon Sep 17 00:00:00 2001 From: Ardian Date: Fri, 9 Aug 2024 13:54:20 +0200 Subject: [PATCH 2/2] release: rc107 --- electron/install.js | 2 +- package.json | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/electron/install.js b/electron/install.js index 372c7b368..f2dcd865f 100644 --- a/electron/install.js +++ b/electron/install.js @@ -14,7 +14,7 @@ const { paths } = require('./constants'); * - 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.0rc105'; +const OlasMiddlewareVersion = '0.1.0rc107'; const path = require('path'); const { app } = require('electron'); diff --git a/package.json b/package.json index 3dd422bfe..5708daec4 100644 --- a/package.json +++ b/package.json @@ -57,5 +57,5 @@ "test:frontend": "cd frontend && yarn test", "download-binaries": "sh download_binaries.sh" }, - "version": "0.1.0-rc105" + "version": "0.1.0-rc107" } diff --git a/pyproject.toml b/pyproject.toml index 8ed25abe0..478a65f63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "olas-operate-middleware" -version = "0.1.0-rc105" +version = "0.1.0-rc107" description = "" authors = ["David Vilela ", "Viraj Patel "] readme = "README.md"