mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2025-01-08 10:25:24 +03:00
Add Bladebit prerelease to prerelease mac builds (#13540)
* Add bladebit for pre-release mac builds. Update pyinstaller to include bladebit if the file exists * Make plotter inclusion conditional based on if they are present for the build or not * temp: always get pre-release bladebit plotter for testing * Only include bladebit on pre-release
This commit is contained in:
parent
4bcbcdbbe4
commit
be4ada9b24
11
.github/workflows/build-macos-installers.yml
vendored
11
.github/workflows/build-macos-installers.yml
vendored
@ -33,11 +33,13 @@ jobs:
|
|||||||
file-suffix: ""
|
file-suffix: ""
|
||||||
mac-package-name: "Chia-darwin-x64"
|
mac-package-name: "Chia-darwin-x64"
|
||||||
glue-name: "build-macos"
|
glue-name: "build-macos"
|
||||||
|
bladebit-suffix: macos-x86-64.tar.gz
|
||||||
- runs-on: [MacOS, ARM64]
|
- runs-on: [MacOS, ARM64]
|
||||||
name: m1
|
name: m1
|
||||||
file-suffix: "-arm64"
|
file-suffix: "-arm64"
|
||||||
mac-package-name: "Chia-darwin-arm64"
|
mac-package-name: "Chia-darwin-arm64"
|
||||||
glue-name: "build-mac-m1"
|
glue-name: "build-mac-m1"
|
||||||
|
bladebit-suffix: macos-arm64.tar.gz
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: Chia-Network/actions/clean-workspace@main
|
- uses: Chia-Network/actions/clean-workspace@main
|
||||||
@ -132,6 +134,15 @@ jobs:
|
|||||||
chmod +x "$GITHUB_WORKSPACE/madmax/chia_plot"
|
chmod +x "$GITHUB_WORKSPACE/madmax/chia_plot"
|
||||||
chmod +x "$GITHUB_WORKSPACE/madmax/chia_plot_k34"
|
chmod +x "$GITHUB_WORKSPACE/madmax/chia_plot_k34"
|
||||||
|
|
||||||
|
- name: Get latest prerelease bladebit plotter
|
||||||
|
if: env.PRE_RELEASE == 'true'
|
||||||
|
run: |
|
||||||
|
PRERELEASE_URL=$(curl -Ls -H "Accept: application/vnd.github+json" "https://api.github.com/repos/Chia-Network/bladebit/releases" | jq -r 'map(select(.prerelease)) | first.assets[] | select(.browser_download_url | endswith("${{ matrix.os.bladebit-suffix }}")).browser_download_url')
|
||||||
|
mkdir "$GITHUB_WORKSPACE/bladebit"
|
||||||
|
wget -O /tmp/bladebit.tar.gz $PRERELEASE_URL
|
||||||
|
tar -xvzf /tmp/bladebit.tar.gz -C $GITHUB_WORKSPACE/bladebit
|
||||||
|
chmod +x "$GITHUB_WORKSPACE/bladebit/bladebit"
|
||||||
|
|
||||||
- uses: ./.github/actions/install
|
- uses: ./.github/actions/install
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
# -*- mode: python ; coding: utf-8 -*-
|
# -*- mode: python ; coding: utf-8 -*-
|
||||||
import importlib
|
import importlib
|
||||||
|
import os
|
||||||
import pathlib
|
import pathlib
|
||||||
import platform
|
import platform
|
||||||
import sysconfig
|
import sysconfig
|
||||||
@ -72,18 +73,25 @@ hiddenimports = []
|
|||||||
hiddenimports.extend(entry_points)
|
hiddenimports.extend(entry_points)
|
||||||
hiddenimports.extend(keyring_imports)
|
hiddenimports.extend(keyring_imports)
|
||||||
|
|
||||||
binaries = [
|
binaries = []
|
||||||
(
|
|
||||||
f"{ROOT}/madmax/chia_plot",
|
|
||||||
"madmax"
|
|
||||||
),
|
|
||||||
(
|
|
||||||
f"{ROOT}/madmax/chia_plot_k34",
|
|
||||||
"madmax"
|
|
||||||
)
|
|
||||||
]
|
|
||||||
|
|
||||||
if not THIS_IS_MAC:
|
if os.path.exists(f"{ROOT}/madmax/chia_plot"):
|
||||||
|
binaries.extend([
|
||||||
|
(
|
||||||
|
f"{ROOT}/madmax/chia_plot",
|
||||||
|
"madmax"
|
||||||
|
)
|
||||||
|
])
|
||||||
|
|
||||||
|
if os.path.exists(f"{ROOT}/madmax/chia_plot_k34",):
|
||||||
|
binaries.extend([
|
||||||
|
(
|
||||||
|
f"{ROOT}/madmax/chia_plot_k34",
|
||||||
|
"madmax"
|
||||||
|
)
|
||||||
|
])
|
||||||
|
|
||||||
|
if os.path.exists(f"{ROOT}/bladebit/bladebit"):
|
||||||
binaries.extend([
|
binaries.extend([
|
||||||
(
|
(
|
||||||
f"{ROOT}/bladebit/bladebit",
|
f"{ROOT}/bladebit/bladebit",
|
||||||
|
Loading…
Reference in New Issue
Block a user