From 245189e0cc833f8d1d9eb9f05e32c8c702347c5b Mon Sep 17 00:00:00 2001 From: Cristian Heredia Date: Sun, 6 Nov 2022 22:47:43 -0800 Subject: [PATCH 1/3] Updated build instructions for bitbox --- bitbox02-firmware/artifacts.sh | 4 ++-- bitbox02-firmware/steps.sh | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/bitbox02-firmware/artifacts.sh b/bitbox02-firmware/artifacts.sh index 82bc0e95b1..6e6fb533c4 100755 --- a/bitbox02-firmware/artifacts.sh +++ b/bitbox02-firmware/artifacts.sh @@ -3,11 +3,11 @@ DATE=`date +%Y-%m-%d` TWITTER_NAME="BitBox02" URL="https://shiftcrypto.ch/bitbox02/" -VERSION="firmware-btc-only/v9.12.0" +VERSION_STRING="v9.12.0" REPO="https://github.com/digitalbitbox/bitbox02-firmware" CHECKSUM_SOURCE="https://github.com/digitalbitbox/bitbox02-firmware/releases/tag/${VERSION}" PROJECT="bitbox02-firmware" -SHA256=`shasum -a 256 firmware/stm32/firmware-signed.bin | cut -f 1 -d ' '` +SHA256=$(shasum -a 256 bitbox02-firmware/releases/temp/build/bin/firmware-btc.bin | cut -f 1 -d ' ') # Note GITHUB_ environment variables are populated by Github Actions ARTIFACT_BASEURL="https://github.com/${GITHUB_REPOSITORY}/raw" diff --git a/bitbox02-firmware/steps.sh b/bitbox02-firmware/steps.sh index 0c83be8d9f..a01d630630 100755 --- a/bitbox02-firmware/steps.sh +++ b/bitbox02-firmware/steps.sh @@ -1,17 +1,16 @@ #!/bin/bash # Pull in version numbers from artifacts.sh -eval "$(grep VERSION artifacts.sh)" +eval "$(grep VERSION_STRING artifacts.sh)" -if [ ! -e bitbox02-firmware ] ; then - # Checkout source and submodules - git clone --progress --recurse-submodules https://github.com/digitalbitbox/bitbox02-firmware +if [ ! -e bitbox02-firmware ]; then + # Checkout source and submodules + git clone --progress https://github.com/digitalbitbox/bitbox02-firmware fi -cd bitbox02-firmware -git checkout ${VERSION_STRING} - -make firmware +cd bitbox02-firmware/releases +./build.sh firmware-btc-only/${VERSION_STRING} "make firmware-btc" +echo "shasum" $(shasum -a 256 temp/build/bin/firmware-btc.bin) # Add delay for results to be printed and recorded sleep 10 From bf4a2eeb70d79859433bffcbfd03354c4c0101a6 Mon Sep 17 00:00:00 2001 From: Cristian Heredia Date: Sun, 6 Nov 2022 22:48:39 -0800 Subject: [PATCH 2/3] Added bitbox02 back into github workflow --- .github/workflows/repro.yml | 30 ++++-------------------------- bitbox02-firmware/artifacts.sh | 2 +- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/.github/workflows/repro.yml b/.github/workflows/repro.yml index 5a84642b43..289359bcd6 100644 --- a/.github/workflows/repro.yml +++ b/.github/workflows/repro.yml @@ -17,8 +17,8 @@ jobs: strategy: matrix: # Working: coldcard, lnd, bitcoin-core, mycelium-android, zap-android, simple-bitcoin-wallet, wasabi, sparrow, blockstream-green - # WIP: trezor-firmware, bitbox02-firmware - project: [coldcard, coldcard-mk3, lnd, bitcoin-core, mycelium-android, zap-android, simple-bitcoin-wallet, wasabi, sparrow, blockstream-green, fulcrum, electrs, cln, poncho] + # WIP: trezor-firmware + project: [coldcard, coldcard-mk3, lnd, bitcoin-core, mycelium-android, zap-android, simple-bitcoin-wallet, wasabi, sparrow, blockstream-green, fulcrum, electrs, cln, poncho, bitbox02-firmware] steps: - name: Setup xvfb for video capture run: | @@ -34,7 +34,7 @@ jobs: uses: actions/checkout@v2 - name: Install ARM toolchain - if: ${{ matrix.project == 'coldcard' || matrix.project == 'coldcard-mk3' || matrix.project == 'trezor-firmware' || matrix.project == 'bitbox02-firmware' }} + if: ${{ matrix.project == 'coldcard' || matrix.project == 'coldcard-mk3' || matrix.project == 'trezor-firmware'}} uses: carlosperate/arm-none-eabi-gcc-action@v1 with: release: 'latest' @@ -54,29 +54,7 @@ jobs: - name: Setup deps for BitBox02 firmware if: ${{ matrix.project == 'bitbox02-firmware' }} - run: | - sudo apt install -y libhidapi-dev cmake protobuf-compiler python3-protobuf - - ( cd /usr/local/bin && ln -s `which arm-none-eabi-gcc` arm-none-eabi-gcc ) - echo "/usr/local/bin" >> $GITHUB_PATH - - # nanopb - wget 'https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.5-linux-x86.tar.gz' - tar xzf nanopb-0.4.5-linux-x86.tar.gz - echo "`pwd`/nanopb-0.4.5-linux-x86/generator-bin" >> $GITHUB_PATH - - # protobuf - #wget 'https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protoc-3.20.1-linux-x86_64.zip' - #mkdir .local - #unzip protoc-3.20.1-linux-x86_64.zip -d .local - #echo "`pwd`/.local/bin" >> $GITHUB_PATH - - # protobuf-python - #wget 'https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-python-3.20.1.tar.gz' - #tar xzf protobuf-python-3.20.1.tar.gz - #cd protobuf-3.20.1/python - #python setup.py build - #sudo python setup.py install + uses: docker/setup-buildx-action@v2 - name: Setup deps for Bitcoin Core if: ${{ matrix.project == 'bitcoin-core' }} diff --git a/bitbox02-firmware/artifacts.sh b/bitbox02-firmware/artifacts.sh index 6e6fb533c4..31184c0774 100755 --- a/bitbox02-firmware/artifacts.sh +++ b/bitbox02-firmware/artifacts.sh @@ -1,6 +1,6 @@ #!/bin/bash -DATE=`date +%Y-%m-%d` +DATE=$(date +%Y-%m-%d) TWITTER_NAME="BitBox02" URL="https://shiftcrypto.ch/bitbox02/" VERSION_STRING="v9.12.0" From f48ae34936fd77007b5938fded036cbaab588fd7 Mon Sep 17 00:00:00 2001 From: Cristian Heredia Date: Mon, 7 Nov 2022 18:35:36 -0800 Subject: [PATCH 3/3] Updated ENTRY_TO_APPEND with VERSION_STRING --- bitbox02-firmware/artifacts.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbox02-firmware/artifacts.sh b/bitbox02-firmware/artifacts.sh index 31184c0774..4d9b5960b7 100755 --- a/bitbox02-firmware/artifacts.sh +++ b/bitbox02-firmware/artifacts.sh @@ -5,7 +5,7 @@ TWITTER_NAME="BitBox02" URL="https://shiftcrypto.ch/bitbox02/" VERSION_STRING="v9.12.0" REPO="https://github.com/digitalbitbox/bitbox02-firmware" -CHECKSUM_SOURCE="https://github.com/digitalbitbox/bitbox02-firmware/releases/tag/${VERSION}" +CHECKSUM_SOURCE="https://github.com/digitalbitbox/bitbox02-firmware/releases/tag/firmware/${VERSION_STRING}" PROJECT="bitbox02-firmware" SHA256=$(shasum -a 256 bitbox02-firmware/releases/temp/build/bin/firmware-btc.bin | cut -f 1 -d ' ') @@ -13,6 +13,6 @@ SHA256=$(shasum -a 256 bitbox02-firmware/releases/temp/build/bin/firmware-btc.bi ARTIFACT_BASEURL="https://github.com/${GITHUB_REPOSITORY}/raw" ARTIFACT_BRANCH=${GITHUB_REF_NAME} -ENTRY_TO_APPEND="
  • ${DATE} | ${PROJECT} | ${VERSION} | factory ${SHA256} | video proof | build bot
    • " +ENTRY_TO_APPEND="
  • ${DATE} | ${PROJECT} | ${VERSION_STRING} | factory ${SHA256} | video proof | build bot
    • " echo ${ENTRY_TO_APPEND}