From a913ac24f894f10895599b74ad5e07c7c762931e Mon Sep 17 00:00:00 2001 From: wallentx Date: Thu, 3 Aug 2023 13:35:10 -0500 Subject: [PATCH 01/22] Adding cuobjdump step --- .github/actions/build-harvester.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 4f95d09f..6f4149c0 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -49,6 +49,12 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DBB_HARVESTER_ONLY=ON cmake --build . --config Release --target bladebit_harvester cmake --install . --prefix harvester_dist +if [[ "$host_os" == "windows" ]]; then + cuobjdump bladebit_harvester.dll +else + cuobjdump libbladebit_harvester.so +fi + pushd harvester_dist/green_reaper if [[ "$host_os" == "windows" ]]; then From da4879aa848e9df5d086a93555c9cbf6d11c98f1 Mon Sep 17 00:00:00 2001 From: wallentx Date: Thu, 3 Aug 2023 14:44:40 -0500 Subject: [PATCH 02/22] finding cuobjdump path --- .github/actions/build-harvester.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 6f4149c0..43ffb949 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -49,9 +49,14 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DBB_HARVESTER_ONLY=ON cmake --build . --config Release --target bladebit_harvester cmake --install . --prefix harvester_dist +env | sort | grep 'CUDA' + +echo "$CUDA_HOME" +PATH="$PATH":"$CUDA_HOME"/bin +/usr/local/cuda/bin if [[ "$host_os" == "windows" ]]; then cuobjdump bladebit_harvester.dll -else +elif [[ "$host_os" == "linux" ]]; then cuobjdump libbladebit_harvester.so fi From 7c9ddd189dec22681f5e8c5e5b6651399778b402 Mon Sep 17 00:00:00 2001 From: wallentx Date: Thu, 3 Aug 2023 15:36:51 -0500 Subject: [PATCH 03/22] debug --- .github/actions/build-harvester.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 43ffb949..f88fb155 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -51,14 +51,17 @@ cmake --install . --prefix harvester_dist env | sort | grep 'CUDA' -echo "$CUDA_HOME" -PATH="$PATH":"$CUDA_HOME"/bin -/usr/local/cuda/bin +set -x if [[ "$host_os" == "windows" ]]; then + echo "$CUDA_HOME" + PATH="$PATH":"$CUDA_HOME"/bin cuobjdump bladebit_harvester.dll elif [[ "$host_os" == "linux" ]]; then + echo "$CUDA_HOME" + PATH="$PATH":"$CUDA_HOME"/bin cuobjdump libbladebit_harvester.so fi +set +x pushd harvester_dist/green_reaper From ce3ff79c28583575962daab7da9bb7348f76a6b6 Mon Sep 17 00:00:00 2001 From: wallentx Date: Thu, 3 Aug 2023 15:56:25 -0500 Subject: [PATCH 04/22] setting path --- .github/actions/build-harvester.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index f88fb155..6feabbf9 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -53,12 +53,10 @@ env | sort | grep 'CUDA' set -x if [[ "$host_os" == "windows" ]]; then - echo "$CUDA_HOME" - PATH="$PATH":"$CUDA_HOME"/bin - cuobjdump bladebit_harvester.dll + 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin\cuobjdump' bladebit_harvester.dll elif [[ "$host_os" == "linux" ]]; then - echo "$CUDA_HOME" - PATH="$PATH":"$CUDA_HOME"/bin + which nvcc + PATH="$PATH":/usr/local/cuda/bin cuobjdump libbladebit_harvester.so fi set +x From e617560ccdaea00e9090619f9c78f7005a945140 Mon Sep 17 00:00:00 2001 From: wallentx Date: Thu, 3 Aug 2023 16:08:08 -0500 Subject: [PATCH 05/22] full path --- .github/actions/build-harvester.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 6feabbf9..b45a1506 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -55,9 +55,7 @@ set -x if [[ "$host_os" == "windows" ]]; then 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin\cuobjdump' bladebit_harvester.dll elif [[ "$host_os" == "linux" ]]; then - which nvcc - PATH="$PATH":/usr/local/cuda/bin - cuobjdump libbladebit_harvester.so + /usr/local/cuda/bin/cuobjdump libbladebit_harvester.so fi set +x From a47184499f087789d3098ce0704bfdadc5ab77a1 Mon Sep 17 00:00:00 2001 From: wallentx Date: Thu, 3 Aug 2023 16:35:45 -0500 Subject: [PATCH 06/22] cleanup and annotate --- .github/actions/build-harvester.sh | 9 ++-- .github/workflows/build-release.yml | 72 ++++++++++++++++++++++++++--- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index b45a1506..4a36be1c 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -51,13 +51,16 @@ cmake --install . --prefix harvester_dist env | sort | grep 'CUDA' -set -x if [[ "$host_os" == "windows" ]]; then - 'C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin\cuobjdump' bladebit_harvester.dll + set -x + '$CUDA_PATH\bin\cuobjdump' bladebit_harvester.dll + set +x elif [[ "$host_os" == "linux" ]]; then + set -x /usr/local/cuda/bin/cuobjdump libbladebit_harvester.so + set +x fi -set +x + pushd harvester_dist/green_reaper diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 27806127..1f71f2cf 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -16,6 +16,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number id: version_number shell: bash @@ -34,7 +39,8 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-linux-x86-64.tar.gz" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") + gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -49,6 +55,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number id: version_number shell: bash @@ -81,7 +92,8 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-windows-x86-64.zip" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") + gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -98,6 +110,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Cache DNF packages uses: actions/cache@v3 with: @@ -135,7 +152,8 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-linux-ARM64.tar.gz" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") + gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -153,6 +171,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number id: version_number run: bash -e .github/actions/get-version.sh macos arm64 @@ -163,7 +186,8 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-macos-arm64.tar.gz" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + BUILD_HARVESTER=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") + gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -181,6 +205,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number id: version_number run: bash -e .github/actions/get-version.sh macos x86-64 @@ -191,7 +220,8 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-macos-x86-64.tar.gz" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") + gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -207,6 +237,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number id: version_number run: .github/actions/get-version.sh ubuntu x86-64 @@ -252,6 +287,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number id: version_number run: .github/actions/get-version.sh centos x86-64 @@ -299,7 +339,7 @@ jobs: name: ${{ env.BB_ARTIFACT_NAME_CUDA }} path: ${{ github.workspace }}/bin/${{ env.BB_ARTIFACT_NAME_CUDA }} if-no-files-found: error - + build-bladebit-centos-arm64: runs-on: [ARM64, Linux] container: @@ -308,6 +348,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number id: version_number run: .github/actions/get-version.sh centos arm64 @@ -340,6 +385,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number id: version_number run: .github/actions/get-version.sh ubuntu arm64 @@ -385,6 +435,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number shell: bash id: version_number @@ -429,6 +484,11 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 + - name: Set Env + uses: Chia-Network/actions/setjobenv@main + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get Version Number shell: bash id: version_number From 2707b916c08808d6965cbb5d78d4d8d147c94b90 Mon Sep 17 00:00:00 2001 From: wallentx Date: Thu, 3 Aug 2023 16:51:54 -0500 Subject: [PATCH 07/22] setjobenv my bramch --- .github/workflows/build-release.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 1f71f2cf..dd6d16ac 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -56,7 +56,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -111,7 +111,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -172,7 +172,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -206,7 +206,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -238,7 +238,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -288,7 +288,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -349,7 +349,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -386,7 +386,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -436,7 +436,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -485,7 +485,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@main + uses: Chia-Network/actions/setjobenv@wallentx-patch-1 env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From be7a80e68bfb729ded75ef7b642f3f1b05faee51 Mon Sep 17 00:00:00 2001 From: wallentx Date: Thu, 3 Aug 2023 19:15:09 -0500 Subject: [PATCH 08/22] Use native env to output --- .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 dd6d16ac..f95163bb 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -40,7 +40,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" + echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 From 6eb7daeffd86470bfd89bc86e88d743359e9eb42 Mon Sep 17 00:00:00 2001 From: William Allen Date: Thu, 3 Aug 2023 19:18:55 -0500 Subject: [PATCH 09/22] Test summary --- .github/workflows/build-release.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index f95163bb..9bf2be65 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -93,8 +93,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" - + echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 with: @@ -153,8 +152,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" - + echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 with: @@ -187,7 +185,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path BUILD_HARVESTER=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" + echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -221,8 +219,8 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - gh run annotate "$GITHUB_RUN_ID" --message "$BUILD_OUTPUT" - + echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" + - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 with: From 519b844a557c2e3c0426db8f43643524ba4e0591 Mon Sep 17 00:00:00 2001 From: William Allen Date: Thu, 3 Aug 2023 20:57:41 -0500 Subject: [PATCH 10/22] ugg --- .github/actions/build-harvester.sh | 27 ++++++++++++++++----------- .github/workflows/build-release.yml | 24 ++++++++++++++---------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 4a36be1c..0f3ebcfe 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -6,11 +6,11 @@ fi host_os=$(uname -a) case "${host_os}" in - Linux*) host_os="linux";; - Darwin*) host_os="macos";; - CYGWIN*) host_os="windows";; - MINGW*) host_os="windows";; - *Msys) host_os="windows";; +Linux*) host_os="linux" ;; +Darwin*) host_os="macos" ;; +CYGWIN*) host_os="windows" ;; +MINGW*) host_os="windows" ;; +*Msys) host_os="windows" ;; esac if [[ "$host_os" == "windows" ]]; then @@ -53,15 +53,14 @@ env | sort | grep 'CUDA' if [[ "$host_os" == "windows" ]]; then set -x - '$CUDA_PATH\bin\cuobjdump' bladebit_harvester.dll + OBJDUMP=$("${CUDA_PATH}"\\bin\\cuobjdump bladebit_harvester.dll) set +x elif [[ "$host_os" == "linux" ]]; then set -x - /usr/local/cuda/bin/cuobjdump libbladebit_harvester.so + OBJDUMP=$(/usr/local/cuda/bin/cuobjdump libbladebit_harvester.so) set +x fi - pushd harvester_dist/green_reaper if [[ "$host_os" == "windows" ]]; then @@ -73,7 +72,7 @@ fi artifact_files=($(find . -type f -name '*.*' | cut -c3-)) # shellcheck disable=SC2068 -$sha_sum ${artifact_files[@]} > sha256checksum +$sha_sum ${artifact_files[@]} >sha256checksum artifact_files+=("sha256checksum") @@ -86,18 +85,24 @@ fi popd mv "harvester_dist/green_reaper/${artifact_name}" ./ -$sha_sum "${artifact_name}" > "${artifact_name}.sha256.txt" +$sha_sum "${artifact_name}" >"${artifact_name}.sha256.txt" ls -la cat "${artifact_name}.sha256.txt" if [[ "$CI" == "true" ]]; then + cat "${artifact_name}.sha256.txt" | while IFS= read -r line; do + echo -e "$(echo ${line#* } | tr -d '*')\n###### ${line%%*}\n" + done >summary.md + + echo "$OBJDUMP" >>summary.md + if [[ "$host_os" == "windows" ]]; then harvester_artifact_path="$(cygpath -m "$(pwd)/${artifact_name}")*" else harvester_artifact_path="$(pwd)/${artifact_name}*" fi echo "harvester_artifact_path=$harvester_artifact_path" - echo "harvester_artifact_path=$harvester_artifact_path" >> "$GITHUB_ENV" + echo "harvester_artifact_path=$harvester_artifact_path" >>"$GITHUB_ENV" fi popd diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 9bf2be65..e51b6fb4 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -39,8 +39,8 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-linux-x86-64.tar.gz" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" + bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + cat summary.md >> "$GITHUB_STEP_SUMMARY" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -92,8 +92,11 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-windows-x86-64.zip" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" + bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + cat summary.md >> "$GITHUB_STEP_SUMMARY" + env: + CUDA_PATH: ${{ steps.cuda-toolkit.outputs.CUDA_PATH }} + - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 with: @@ -151,8 +154,9 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-linux-ARM64.tar.gz" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" + bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + cat summary.md >> "$GITHUB_STEP_SUMMARY" + - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 with: @@ -218,9 +222,9 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-macos-x86-64.tar.gz" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - BUILD_OUTPUT=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" - + bash .github/actions/build-harvester.sh --artifact "${artifact_name}" + cat summary.md >> "$GITHUB_STEP_SUMMARY" + - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 with: @@ -358,7 +362,7 @@ jobs: - name: Install Prerequisites run: | dnf install -y gcc-toolset-9-gcc gcc-toolset-9-gcc-c++ \ - cmake gmp-devel numactl-devel make git + cmake gmp-devel numactl-devel make git - name: Build run: | From 38b3535fecc041f57d0ebfb7c559639e5ade5e08 Mon Sep 17 00:00:00 2001 From: William Allen Date: Thu, 3 Aug 2023 21:02:57 -0500 Subject: [PATCH 11/22] conditional --- .github/workflows/build-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index e51b6fb4..1a5e5a88 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -40,7 +40,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - cat summary.md >> "$GITHUB_STEP_SUMMARY" + [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -93,7 +93,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - cat summary.md >> "$GITHUB_STEP_SUMMARY" + [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" env: CUDA_PATH: ${{ steps.cuda-toolkit.outputs.CUDA_PATH }} @@ -155,7 +155,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - cat summary.md >> "$GITHUB_STEP_SUMMARY" + [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -223,7 +223,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - cat summary.md >> "$GITHUB_STEP_SUMMARY" + [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 From 925a2fc19cbaf44a1c63aff09392a14bc80670cb Mon Sep 17 00:00:00 2001 From: William Allen Date: Thu, 3 Aug 2023 21:09:01 -0500 Subject: [PATCH 12/22] Conditional --- .github/actions/build-harvester.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 0f3ebcfe..cb468418 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -90,11 +90,13 @@ ls -la cat "${artifact_name}.sha256.txt" if [[ "$CI" == "true" ]]; then - cat "${artifact_name}.sha256.txt" | while IFS= read -r line; do - echo -e "$(echo ${line#* } | tr -d '*')\n###### ${line%%*}\n" - done >summary.md + if [[ "$host_os" == "windows" ]] || [[ "$host_os" == "linux" ]]; then + cat "${artifact_name}.sha256.txt" | while IFS= read -r line; do + echo -e "$(echo ${line#* } | tr -d '*')\n###### ${line%%*}\n" + done >summary.md - echo "$OBJDUMP" >>summary.md + echo "$OBJDUMP" >>summary.md + fi if [[ "$host_os" == "windows" ]]; then harvester_artifact_path="$(cygpath -m "$(pwd)/${artifact_name}")*" From 6b7a9a018b513577e1c4ae155312849b9cf11ac0 Mon Sep 17 00:00:00 2001 From: William Allen Date: Thu, 3 Aug 2023 21:21:17 -0500 Subject: [PATCH 13/22] no error --- .github/actions/build-harvester.sh | 4 ---- .github/workflows/build-release.yml | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index cb468418..9168663b 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -52,13 +52,9 @@ cmake --install . --prefix harvester_dist env | sort | grep 'CUDA' if [[ "$host_os" == "windows" ]]; then - set -x OBJDUMP=$("${CUDA_PATH}"\\bin\\cuobjdump bladebit_harvester.dll) - set +x elif [[ "$host_os" == "linux" ]]; then - set -x OBJDUMP=$(/usr/local/cuda/bin/cuobjdump libbladebit_harvester.so) - set +x fi pushd harvester_dist/green_reaper diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 1a5e5a88..248e2da9 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -40,7 +40,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" + [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" || echo "No Summary" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -93,7 +93,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" + [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" || echo "No Summary" env: CUDA_PATH: ${{ steps.cuda-toolkit.outputs.CUDA_PATH }} @@ -155,7 +155,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" + [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" || echo "No Summary" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -223,7 +223,7 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" + [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" || echo "No Summary" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 From dd15f5425f6eaa61a36f03654ea8538dbccd1cae Mon Sep 17 00:00:00 2001 From: William Allen Date: Fri, 4 Aug 2023 02:07:52 -0500 Subject: [PATCH 14/22] Update build-harvester.sh --- .github/actions/build-harvester.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 9168663b..0592a5e8 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -49,8 +49,6 @@ cmake .. -DCMAKE_BUILD_TYPE=Release -DBB_HARVESTER_ONLY=ON cmake --build . --config Release --target bladebit_harvester cmake --install . --prefix harvester_dist -env | sort | grep 'CUDA' - if [[ "$host_os" == "windows" ]]; then OBJDUMP=$("${CUDA_PATH}"\\bin\\cuobjdump bladebit_harvester.dll) elif [[ "$host_os" == "linux" ]]; then @@ -89,9 +87,9 @@ if [[ "$CI" == "true" ]]; then if [[ "$host_os" == "windows" ]] || [[ "$host_os" == "linux" ]]; then cat "${artifact_name}.sha256.txt" | while IFS= read -r line; do echo -e "$(echo ${line#* } | tr -d '*')\n###### ${line%%*}\n" - done >summary.md + done > "$GITHUB_STEP_SUMMARY" - echo "$OBJDUMP" >>summary.md + echo "$OBJDUMP" >> "$GITHUB_STEP_SUMMARY" fi if [[ "$host_os" == "windows" ]]; then From 924cc9601082afad7f5c4072ed851e63d83f7aa0 Mon Sep 17 00:00:00 2001 From: wallentx Date: Fri, 4 Aug 2023 02:29:32 -0500 Subject: [PATCH 15/22] Fixing summary --- .github/workflows/build-release.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 248e2da9..60fcebb7 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -40,7 +40,6 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" || echo "No Summary" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -93,7 +92,6 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" || echo "No Summary" env: CUDA_PATH: ${{ steps.cuda-toolkit.outputs.CUDA_PATH }} @@ -155,7 +153,6 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" || echo "No Summary" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -188,8 +185,7 @@ jobs: export artifact_name="green_reaper-v${{ env.BB_VERSION }}-macos-arm64.tar.gz" echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path - BUILD_HARVESTER=$(bash .github/actions/build-harvester.sh --artifact "${artifact_name}") - echo "$BUILD_OUTPUT" >> "$GITHUB_STEP_SUMMARY" + bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -223,7 +219,6 @@ jobs: echo "harvester_artifact_name=${artifact_name}" >> "$GITHUB_ENV" # emits env.harvester_artifact_path bash .github/actions/build-harvester.sh --artifact "${artifact_name}" - [[ -f "summary.md" ]] && cat summary.md >> "$GITHUB_STEP_SUMMARY" || echo "No Summary" - name: Upload Harvester Artifact uses: actions/upload-artifact@v3 @@ -303,7 +298,6 @@ jobs: set -eo pipefail dnf install -y gcc-toolset-9-gcc gcc-toolset-9-gcc-c++ \ gmp-devel numactl-devel make git wget subscription-manager - bash .github/actions/install-cmake-linux.sh - name: Build Bladebit From 97bcae4021141211df2bc4202b322160c924a1b2 Mon Sep 17 00:00:00 2001 From: wallentx Date: Fri, 4 Aug 2023 03:26:24 -0500 Subject: [PATCH 16/22] Final --- .github/actions/build-harvester.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 0592a5e8..bf71160b 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -85,11 +85,19 @@ cat "${artifact_name}.sha256.txt" if [[ "$CI" == "true" ]]; then if [[ "$host_os" == "windows" ]] || [[ "$host_os" == "linux" ]]; then - cat "${artifact_name}.sha256.txt" | while IFS= read -r line; do - echo -e "$(echo ${line#* } | tr -d '*')\n###### ${line%%*}\n" - done > "$GITHUB_STEP_SUMMARY" - - echo "$OBJDUMP" >> "$GITHUB_STEP_SUMMARY" + while IFS= read -r line; do + echo -e "$(echo ${line#* } | tr -d '*')\n###### ${line%% *}\n" + done <"${artifact_name}.sha256.txt" >> "$GITHUB_STEP_SUMMARY" + echo "| Arch | Code Version | Host | Compile Size |" >> "$GITHUB_STEP_SUMMARY" + echo "| --- | --- | --- | --- |" >> "$GITHUB_STEP_SUMMARY" + echo "$OBJDUMP" | awk -v RS= -v FS='\n' -v OFS=' | ' '{ + for (i=1; i<=NF; i++) { + if (index($i, "=")) { + gsub(/.* = /, "", $i); + } + } + print $3, $4, $5, $6; + }' | sed 's/^/| /; s/$/ |/; s/ | | / | /g' >> "$GITHUB_STEP_SUMMARY" fi if [[ "$host_os" == "windows" ]]; then From 7c8e8e49bfaa40199ac0dd5138dbb00c7d613fdb Mon Sep 17 00:00:00 2001 From: wallentx Date: Fri, 4 Aug 2023 04:06:56 -0500 Subject: [PATCH 17/22] windows cuobjdump debug --- .github/actions/build-harvester.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index bf71160b..ecc86183 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -38,6 +38,9 @@ while true; do shift || break done +if [[ "$host_os" == "windows" ]]; then + "${CUDA_PATH}"\bin\cuobjdump --version +fi echo "Harvester artifact: ${artifact_name}" echo 'cmake --version' cmake --version @@ -50,7 +53,7 @@ cmake --build . --config Release --target bladebit_harvester cmake --install . --prefix harvester_dist if [[ "$host_os" == "windows" ]]; then - OBJDUMP=$("${CUDA_PATH}"\\bin\\cuobjdump bladebit_harvester.dll) + OBJDUMP=$("${CUDA_PATH}"\bin\cuobjdump bladebit_harvester.dll) elif [[ "$host_os" == "linux" ]]; then OBJDUMP=$(/usr/local/cuda/bin/cuobjdump libbladebit_harvester.so) fi From f4dde4bf47e4c585b6e02f27cc4cf8e82fb1cb27 Mon Sep 17 00:00:00 2001 From: wallentx Date: Fri, 4 Aug 2023 05:04:46 -0500 Subject: [PATCH 18/22] fix path --- .github/actions/build-harvester.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index ecc86183..cb3a8e3e 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -39,7 +39,7 @@ while true; do done if [[ "$host_os" == "windows" ]]; then - "${CUDA_PATH}"\bin\cuobjdump --version + "${CUDA_PATH}"\\bin\\cuobjdump --version fi echo "Harvester artifact: ${artifact_name}" echo 'cmake --version' @@ -53,7 +53,7 @@ cmake --build . --config Release --target bladebit_harvester cmake --install . --prefix harvester_dist if [[ "$host_os" == "windows" ]]; then - OBJDUMP=$("${CUDA_PATH}"\bin\cuobjdump bladebit_harvester.dll) + OBJDUMP=$("${CUDA_PATH}"\\bin\\cuobjdump *.dll) elif [[ "$host_os" == "linux" ]]; then OBJDUMP=$(/usr/local/cuda/bin/cuobjdump libbladebit_harvester.so) fi From 25429e8e2e2186f6bba74fcab9884d812bb0522e Mon Sep 17 00:00:00 2001 From: wallentx Date: Fri, 4 Aug 2023 11:02:48 -0500 Subject: [PATCH 19/22] dll path --- .github/actions/build-harvester.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index cb3a8e3e..b93332a4 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -38,9 +38,6 @@ while true; do shift || break done -if [[ "$host_os" == "windows" ]]; then - "${CUDA_PATH}"\\bin\\cuobjdump --version -fi echo "Harvester artifact: ${artifact_name}" echo 'cmake --version' cmake --version @@ -50,14 +47,14 @@ pushd build-harvester cmake .. -DCMAKE_BUILD_TYPE=Release -DBB_HARVESTER_ONLY=ON cmake --build . --config Release --target bladebit_harvester -cmake --install . --prefix harvester_dist if [[ "$host_os" == "windows" ]]; then - OBJDUMP=$("${CUDA_PATH}"\\bin\\cuobjdump *.dll) + OBJDUMP=$("${CUDA_PATH}"\\bin\\cuobjdump Release\\bladebit_harvester.dll) elif [[ "$host_os" == "linux" ]]; then OBJDUMP=$(/usr/local/cuda/bin/cuobjdump libbladebit_harvester.so) fi +cmake --install . --prefix harvester_dist pushd harvester_dist/green_reaper if [[ "$host_os" == "windows" ]]; then From bb296cdbe608ff90d5af2af8218ba7dff5bd6526 Mon Sep 17 00:00:00 2001 From: wallentx Date: Fri, 4 Aug 2023 11:44:01 -0500 Subject: [PATCH 20/22] switching setjobenv back to main --- .github/workflows/build-release.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 60fcebb7..0cfc70cc 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -55,7 +55,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -111,7 +111,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -171,7 +171,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -204,7 +204,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -235,7 +235,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -285,7 +285,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -345,7 +345,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -382,7 +382,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -432,7 +432,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -481,7 +481,7 @@ jobs: uses: actions/checkout@v3 - name: Set Env - uses: Chia-Network/actions/setjobenv@wallentx-patch-1 + uses: Chia-Network/actions/setjobenv@main env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ac5073a0b063b12ab9b96a345c4b20a8499c8a47 Mon Sep 17 00:00:00 2001 From: William Allen Date: Fri, 4 Aug 2023 13:14:04 -0500 Subject: [PATCH 21/22] Update build-harvester.sh --- .github/actions/build-harvester.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index b93332a4..3451f04f 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -5,12 +5,11 @@ if [[ $RUNNER_DEBUG = 1 ]]; then fi host_os=$(uname -a) -case "${host_os}" in -Linux*) host_os="linux" ;; -Darwin*) host_os="macos" ;; -CYGWIN*) host_os="windows" ;; -MINGW*) host_os="windows" ;; -*Msys) host_os="windows" ;; + Linux*) host_os="linux";; + Darwin*) host_os="macos";; + CYGWIN*) host_os="windows";; + MINGW*) host_os="windows";; + *Msys) host_os="windows";; esac if [[ "$host_os" == "windows" ]]; then @@ -66,7 +65,7 @@ fi artifact_files=($(find . -type f -name '*.*' | cut -c3-)) # shellcheck disable=SC2068 -$sha_sum ${artifact_files[@]} >sha256checksum +$sha_sum ${artifact_files[@]} > sha256checksum artifact_files+=("sha256checksum") @@ -79,7 +78,7 @@ fi popd mv "harvester_dist/green_reaper/${artifact_name}" ./ -$sha_sum "${artifact_name}" >"${artifact_name}.sha256.txt" +$sha_sum "${artifact_name}" > "${artifact_name}.sha256.txt" ls -la cat "${artifact_name}.sha256.txt" @@ -106,7 +105,7 @@ if [[ "$CI" == "true" ]]; then harvester_artifact_path="$(pwd)/${artifact_name}*" fi echo "harvester_artifact_path=$harvester_artifact_path" - echo "harvester_artifact_path=$harvester_artifact_path" >>"$GITHUB_ENV" + echo "harvester_artifact_path=$harvester_artifact_path" >> "$GITHUB_ENV" fi popd From e808230bb187d80a0023da176a1b350988cf0702 Mon Sep 17 00:00:00 2001 From: William Allen Date: Fri, 4 Aug 2023 13:20:33 -0500 Subject: [PATCH 22/22] Update build-harvester.sh --- .github/actions/build-harvester.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build-harvester.sh b/.github/actions/build-harvester.sh index 3451f04f..2460a279 100644 --- a/.github/actions/build-harvester.sh +++ b/.github/actions/build-harvester.sh @@ -5,6 +5,7 @@ if [[ $RUNNER_DEBUG = 1 ]]; then fi host_os=$(uname -a) +case "${host_os}" in Linux*) host_os="linux";; Darwin*) host_os="macos";; CYGWIN*) host_os="windows";;