From 0218b047b81b42b4c92c65265d295c762c49ace6 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 2 Nov 2022 12:08:55 -0400 Subject: [PATCH 01/24] empty for testing From 9b33d4f9ea9b14f6531a01026a761141466e6cda Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 2 Nov 2022 13:18:51 -0400 Subject: [PATCH 02/24] verbosity --- .github/workflows/build-release.yml | 3 +++ CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index db4d6908..52ad9082 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -4,6 +4,9 @@ on: branches: ['*'] workflow_dispatch: +env: + CMAKE_BUILD_PARALLEL_LEVEL: 1 + jobs: build-ubuntu-x86-64: runs-on: ubuntu-20.04 diff --git a/CMakeLists.txt b/CMakeLists.txt index a8022376..6704f3cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR) +set(CMAKE_VERBOSE_MAKEFILE ON) +set(CMAKE_FIND_DEBUG_MODE ON) + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) From bcfdec6431949a85353cce3c9f1069c66e61d837 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 10:00:25 -0400 Subject: [PATCH 03/24] show artifact size --- .github/actions/build-asset-unix.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index 2ff28d7c..1182ebe5 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -33,6 +33,7 @@ if [[ "$bb_version" != "$BB_VERSION" ]]; then exit 1 fi +ls -la $BB_ARTIFACT_NAME tar -czvf $BB_ARTIFACT_NAME bladebit mkdir ../bin mv $BB_ARTIFACT_NAME ../bin/ From 8671768ece01e1382a075403a0cc68804ea2b174 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 10:10:42 -0400 Subject: [PATCH 04/24] oops --- .github/actions/build-asset-unix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index 1182ebe5..fa97d717 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -33,7 +33,7 @@ if [[ "$bb_version" != "$BB_VERSION" ]]; then exit 1 fi -ls -la $BB_ARTIFACT_NAME +ls -la bladebit tar -czvf $BB_ARTIFACT_NAME bladebit mkdir ../bin mv $BB_ARTIFACT_NAME ../bin/ From b374e0101eaf452cc708db23d68a46f3a2cdc40b Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 10:19:08 -0400 Subject: [PATCH 05/24] empty for testing From 369b68c18d3fae8fe7757ec87b7b9bbf8329be94 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 10:49:06 -0400 Subject: [PATCH 06/24] check archive size prior to moving --- .github/actions/build-asset-unix.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index fa97d717..f743ce6a 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -35,6 +35,7 @@ fi ls -la bladebit tar -czvf $BB_ARTIFACT_NAME bladebit +ls -la $BB_ARTIFACT_NAME mkdir ../bin mv $BB_ARTIFACT_NAME ../bin/ ls -la ../bin From dcd210da369e0d8974a2559293998bdacc4b3ace Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 10:56:30 -0400 Subject: [PATCH 07/24] upload the original executable as well --- .github/actions/build-asset-unix.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index f743ce6a..dd8e60a7 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -37,6 +37,7 @@ ls -la bladebit tar -czvf $BB_ARTIFACT_NAME bladebit ls -la $BB_ARTIFACT_NAME mkdir ../bin +cp bladebit ../bin/ mv $BB_ARTIFACT_NAME ../bin/ ls -la ../bin From eedb7809d60a822eb7354c4b0d6f8c143a907ecf Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 11:08:26 -0400 Subject: [PATCH 08/24] get the whole bin directory --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 52ad9082..90133e82 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -231,5 +231,5 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} + path: ${{ github.workspace }}/bin/ if-no-files-found: error From 4838de3eff9885c6e05b72de8476707234bdc004 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 11:15:15 -0400 Subject: [PATCH 09/24] empty for testing From 32ab5183f69ec2f7b5df75cc191f1dbe19766faf Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 11:40:20 -0400 Subject: [PATCH 10/24] check zero counts on the files in ci --- .github/actions/build-asset-unix.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index dd8e60a7..fb0e34f8 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -34,10 +34,14 @@ if [[ "$bb_version" != "$BB_VERSION" ]]; then fi ls -la bladebit +python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' tar -czvf $BB_ARTIFACT_NAME bladebit ls -la $BB_ARTIFACT_NAME mkdir ../bin cp bladebit ../bin/ mv $BB_ARTIFACT_NAME ../bin/ ls -la ../bin - +mkdir tmp +cd tmp +tar -xvf ../../$BB_ARTIFACT_NAME +python -c 'f = open("bladebit.notar.tarred", "rb"); contents = f.read(); print(contents.count(b"\x00"))' From d8dbb525637cd55592b1014ec23c43a4cfa0c098 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 11:43:00 -0400 Subject: [PATCH 11/24] some more --- .github/actions/build-asset-unix.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index fb0e34f8..acf55c49 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -6,6 +6,7 @@ # - BB_VERSION # set -eo pipefail +set -vx thread_count=2 @@ -39,9 +40,14 @@ tar -czvf $BB_ARTIFACT_NAME bladebit ls -la $BB_ARTIFACT_NAME mkdir ../bin cp bladebit ../bin/ +mkdir tmp +cd tmp +tar -xvf ../$BB_ARTIFACT_NAME +python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' +cd .. mv $BB_ARTIFACT_NAME ../bin/ -ls -la ../bin +ls -la ../bin/ mkdir tmp cd tmp -tar -xvf ../../$BB_ARTIFACT_NAME -python -c 'f = open("bladebit.notar.tarred", "rb"); contents = f.read(); print(contents.count(b"\x00"))' +tar -xvf ../$BB_ARTIFACT_NAME +python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' From 89a7863d46fee4538d3ce9211967c955caf3e331 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 11:44:37 -0400 Subject: [PATCH 12/24] some more --- .github/actions/build-asset-unix.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index acf55c49..6cb05c34 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -40,14 +40,14 @@ tar -czvf $BB_ARTIFACT_NAME bladebit ls -la $BB_ARTIFACT_NAME mkdir ../bin cp bladebit ../bin/ -mkdir tmp -cd tmp +mkdir tmp1 +cd tmp1 tar -xvf ../$BB_ARTIFACT_NAME python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' cd .. mv $BB_ARTIFACT_NAME ../bin/ ls -la ../bin/ -mkdir tmp -cd tmp +mkdir tmp2 +cd tmp2 tar -xvf ../$BB_ARTIFACT_NAME python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' From 948a718b668a6d6b9f22a2d2fb75eab8d627a419 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 11:47:01 -0400 Subject: [PATCH 13/24] some more --- .github/actions/build-asset-unix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index 6cb05c34..6cd40f15 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -49,5 +49,5 @@ mv $BB_ARTIFACT_NAME ../bin/ ls -la ../bin/ mkdir tmp2 cd tmp2 -tar -xvf ../$BB_ARTIFACT_NAME +tar -xvf ../bin/$BB_ARTIFACT_NAME python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' From 87c4c177a7c650e5e45b43bf0c54b833950e49f0 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 11:49:06 -0400 Subject: [PATCH 14/24] some more --- .github/actions/build-asset-unix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index 6cd40f15..9dd56731 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -49,5 +49,5 @@ mv $BB_ARTIFACT_NAME ../bin/ ls -la ../bin/ mkdir tmp2 cd tmp2 -tar -xvf ../bin/$BB_ARTIFACT_NAME +tar -xvf ../../bin/$BB_ARTIFACT_NAME python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' From 3ec190f7e9f52f223ba95eec67a50feac77fe0bd Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 11:50:57 -0400 Subject: [PATCH 15/24] python3 --- .github/actions/build-asset-unix.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index 9dd56731..cf44ed56 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -35,7 +35,7 @@ if [[ "$bb_version" != "$BB_VERSION" ]]; then fi ls -la bladebit -python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' +python3 -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' tar -czvf $BB_ARTIFACT_NAME bladebit ls -la $BB_ARTIFACT_NAME mkdir ../bin @@ -43,11 +43,11 @@ cp bladebit ../bin/ mkdir tmp1 cd tmp1 tar -xvf ../$BB_ARTIFACT_NAME -python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' +python3 -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' cd .. mv $BB_ARTIFACT_NAME ../bin/ ls -la ../bin/ mkdir tmp2 cd tmp2 tar -xvf ../../bin/$BB_ARTIFACT_NAME -python -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' +python3 -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' From 9174dce5ada2ba0ec6472f8ffac282b4964e7c4d Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 12:18:57 -0400 Subject: [PATCH 16/24] empty for testing From 893da519d558e7f50ba0893b55f2d6fe2e0afe10 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 15:11:39 -0400 Subject: [PATCH 17/24] tar --version --- .github/actions/build-asset-unix.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index cf44ed56..b916699d 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -34,6 +34,7 @@ if [[ "$bb_version" != "$BB_VERSION" ]]; then exit 1 fi +tar --version ls -la bladebit python3 -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' tar -czvf $BB_ARTIFACT_NAME bladebit From f72b19ab1ede802eeae06834087a1a49e69bb4f3 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 20:57:41 -0400 Subject: [PATCH 18/24] diff to fail --- .github/actions/build-asset-unix.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index b916699d..eae5b2c5 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -45,10 +45,4 @@ mkdir tmp1 cd tmp1 tar -xvf ../$BB_ARTIFACT_NAME python3 -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' -cd .. -mv $BB_ARTIFACT_NAME ../bin/ -ls -la ../bin/ -mkdir tmp2 -cd tmp2 -tar -xvf ../../bin/$BB_ARTIFACT_NAME -python3 -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' +diff bladebit ../../bin/bladebit From 1142bbe1bec9788acc258956eec79d3cf3261a75 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 21:00:49 -0400 Subject: [PATCH 19/24] bring back the artifact --- .github/actions/build-asset-unix.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index eae5b2c5..96f091a4 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -46,3 +46,6 @@ cd tmp1 tar -xvf ../$BB_ARTIFACT_NAME python3 -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' diff bladebit ../../bin/bladebit +cd .. +mv $BB_ARTIFACT_NAME ../bin/ +ls -la ../bin/ From 67ad2208a720421594be9e954f58a08061c3522b Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 21:11:38 -0400 Subject: [PATCH 20/24] only the trouble --- .github/workflows/build-release.yml | 197 ---------------------------- 1 file changed, 197 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 90133e82..1289c9df 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -8,203 +8,6 @@ env: CMAKE_BUILD_PARALLEL_LEVEL: 1 jobs: - build-ubuntu-x86-64: - runs-on: ubuntu-20.04 - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - - name: Get Version Number - id: version_number - run: .github/actions/get-version.sh ubuntu x86-64 - - - name: Install Prerequisites - run: sudo apt install -y libgmp-dev libnuma-dev - - - name: Build - env: - BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}} - run: .github/actions/build-asset-unix.sh - - - name: Upload Artifact Ubuntu x86-64 - uses: actions/upload-artifact@v2 - with: - name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - if-no-files-found: error - - build-centos-x86-64: - runs-on: ubuntu-20.04 - container: - image: quay.io/centos/centos:stream8 - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - - name: Get Version Number - id: version_number - run: .github/actions/get-version.sh centos x86-64 - - - name: Install Prerequisites - run: | - dnf install -y gcc-toolset-9-gcc gcc-toolset-9-gcc-c++ \ - cmake gmp-devel numactl-devel make git - - - name: Build - env: - BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}} - run: | - source /opt/rh/gcc-toolset-9/enable - .github/actions/build-asset-unix.sh - - - name: Upload Artifact CentOS x86-64 - uses: actions/upload-artifact@v2 - with: - name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - if-no-files-found: error - - build-ubuntu-arm64: - runs-on: [ARM64, Linux] - container: - image: chianetwork/ubuntu-20.04-builder:latest - defaults: - run: - shell: bash - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - - name: Get Version Number - id: version_number - run: .github/actions/get-version.sh ubuntu arm64 - - - name: Install Prerequisites - run: | - export DEBIAN_FRONTEND=noninteractive - apt update - apt install -y build-essential git libgmp-dev libnuma-dev - - - name: Build - env: - BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}} - run: .github/actions/build-asset-unix.sh - - - name: Upload Artifact Ubuntu ARM64 - uses: actions/upload-artifact@v2 - with: - name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - if-no-files-found: error - - build-centos-arm64: - runs-on: [ARM64, Linux] - container: - image: quay.io/centos/centos:stream8 - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - - name: Get Version Number - id: version_number - run: .github/actions/get-version.sh centos arm64 - - - name: Install Prerequisites - run: | - dnf install -y gcc-toolset-9-gcc gcc-toolset-9-gcc-c++ \ - cmake gmp-devel numactl-devel make git - - - name: Build - env: - BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}} - run: | - source /opt/rh/gcc-toolset-9/enable - .github/actions/build-asset-unix.sh - - - name: Upload Artifact CentOS ARM64 - uses: actions/upload-artifact@v2 - with: - name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - if-no-files-found: error - - build-windows-x86-64: - runs-on: windows-2019 - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - - name: Get Version Number - shell: bash - id: version_number - run: .github/actions/get-version.sh windows x86-64 - - - name: Build - shell: bash - env: - BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}} - run: | - - mkdir build && cd build - cmake .. - bash -e -o pipefail ../embed-version.sh - cat ../src/Version.h - cmake --build . --target bladebit --config Release - - # Ensure bladebit version matches expected version - bb_version="$(./Release/bladebit.exe --version | xargs)" - - if [[ "$bb_version" != "$BB_VERSION" ]]; then - >&2 echo "Incorrect bladebit version. Got but '$bb_version' expected '$BB_VERSION'." - exit 1 - fi - - mkdir ../bin - cd Release - 7z.exe a -tzip ../../bin/${BB_ARTIFACT_NAME} bladebit.exe - ls -la ../../bin - - - name: Upload Artifact Windows x86-64 - uses: actions/upload-artifact@v2 - with: - name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - if-no-files-found: error - - build-macos-arm64: - runs-on: [macOS, ARM64] - steps: - - name: Cleanup Environment - uses: Chia-Network/actions/clean-workspace@main - - - name: Checkout Repo - uses: actions/checkout@v3 - - - name: Get Version Number - id: version_number - run: bash -e .github/actions/get-version.sh macos arm64 - - - name: Install Prerequisites - run: brew install cmake - - - name: Build - env: - BB_ARTIFACT_NAME: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - BB_VERSION: ${{steps.version_number.outputs.BB_VERSION}} - run: .github/actions/build-asset-unix.sh - - - name: Upload Artifact macOS arm64 - uses: actions/upload-artifact@v2 - with: - name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - path: ${{ github.workspace }}/bin/${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} - if-no-files-found: error - build-macos-x86-64: runs-on: macOS-latest steps: From f2208e27c19dd0557f704be73289d77f680dae06 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 21:15:57 -0400 Subject: [PATCH 21/24] always upload --- .github/workflows/build-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 1289c9df..5e1205c2 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -31,6 +31,7 @@ jobs: run: .github/actions/build-asset-unix.sh - name: Upload Artifact macOS x86-64 + if: always() uses: actions/upload-artifact@v2 with: name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} From f8598d7c8d3cb1c5a4306e8d7a71aaf7da19d3d6 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 21:16:31 -0400 Subject: [PATCH 22/24] matrix --- .github/workflows/build-release.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 5e1205c2..ffad725c 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -9,7 +9,13 @@ env: jobs: build-macos-x86-64: - runs-on: macOS-latest + name: tar - ${{ matrix.runs-on }} - ${{ matrix.n }} + runs-on: ${{ matrix.runs-on }} + strategy: + fail-fast: false + matrix: + runs-on: [macos-11, macos-12, macos-latest] + n: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80] steps: - name: Cleanup Environment uses: Chia-Network/actions/clean-workspace@main From c6e19870be7643d73b8c5d6b8b0c6f7115233214 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 21:33:57 -0400 Subject: [PATCH 23/24] name the attributes --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index ffad725c..edb755e4 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -40,6 +40,6 @@ jobs: if: always() uses: actions/upload-artifact@v2 with: - name: ${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} + name: ${{ matrix.runs-on }}-${{ matrix.n }}-${{ steps.version_number.outputs.BB_ARTIFACT_NAME }} path: ${{ github.workspace }}/bin/ if-no-files-found: error From 7dfcaeff480ee01215d71a1d4a622d840d78e732 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Thu, 3 Nov 2022 22:04:54 -0400 Subject: [PATCH 24/24] artifact the bad one too --- .github/actions/build-asset-unix.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index 96f091a4..d8c7c844 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -45,6 +45,7 @@ mkdir tmp1 cd tmp1 tar -xvf ../$BB_ARTIFACT_NAME python3 -c 'f = open("bladebit", "rb"); contents = f.read(); print("zero count:", contents.count(b"\x00"))' +cp bladebit ../../bin/bladebit.tarred-untarred diff bladebit ../../bin/bladebit cd .. mv $BB_ARTIFACT_NAME ../bin/