From 83f3d768cafcb2e9c9f266bce87da3bbdb1c7820 Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Fri, 12 Jul 2024 19:32:04 -0400 Subject: [PATCH 1/6] add install musl-gcc --- .github/workflows/upload-daemon.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-daemon.yml b/.github/workflows/upload-daemon.yml index 0e15c14..39f329f 100644 --- a/.github/workflows/upload-daemon.yml +++ b/.github/workflows/upload-daemon.yml @@ -3,7 +3,7 @@ name: Upload Daemon on: push: branches: - - master + - upload-daemon jobs: setup-build-upload-linux-daemon: @@ -16,6 +16,11 @@ jobs: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source $HOME/.cargo/env + - name: Install musl-tools + run: | + sudo apt-get update + sudo apt-get install -y musl-tools + - name: Build Linux Binary run: | rustup target add x86_64-unknown-linux-musl From 0c866c8d2cb74ea2f6ea179c0bf529b0cda9e6bc Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Fri, 12 Jul 2024 19:40:00 -0400 Subject: [PATCH 2/6] fix b2 --- .github/workflows/upload-daemon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-daemon.yml b/.github/workflows/upload-daemon.yml index 39f329f..739bab6 100644 --- a/.github/workflows/upload-daemon.yml +++ b/.github/workflows/upload-daemon.yml @@ -32,5 +32,5 @@ jobs: B2_APPLICATION_KEY: ${{ secrets.B2_APPLICATION_KEY }} run: | pip install b2 - b2 authorize-account $B2_ACCOUNT_ID $B2_APPLICATION_KEY + b2 account authorize $B2_ACCOUNT_ID $B2_APPLICATION_KEY b2 upload-file earendil ./target/x86_64-unknown-linux-musl/release/earendil earendil-linux-amd64 From e0179f703d10ddf3b23635a0f599692ce9cc0467 Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Fri, 12 Jul 2024 19:52:18 -0400 Subject: [PATCH 3/6] try again --- .github/workflows/upload-daemon.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-daemon.yml b/.github/workflows/upload-daemon.yml index 739bab6..825762b 100644 --- a/.github/workflows/upload-daemon.yml +++ b/.github/workflows/upload-daemon.yml @@ -1,4 +1,5 @@ name: Upload Daemon +# to b2 on: push: From f7fbadd2bf799d74c8260d7fc7635aec1f9a165d Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Fri, 12 Jul 2024 20:17:48 -0400 Subject: [PATCH 4/6] try again --- .github/workflows/upload-daemon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-daemon.yml b/.github/workflows/upload-daemon.yml index 825762b..df8d537 100644 --- a/.github/workflows/upload-daemon.yml +++ b/.github/workflows/upload-daemon.yml @@ -1,5 +1,5 @@ name: Upload Daemon -# to b2 +# upload to b2 bucket earendil on: push: From 2be7a908e324d6614da18ae242264b0754d773fd Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Fri, 12 Jul 2024 20:24:57 -0400 Subject: [PATCH 5/6] fix upload to b2 --- .github/workflows/upload-daemon.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/upload-daemon.yml b/.github/workflows/upload-daemon.yml index df8d537..f17e94d 100644 --- a/.github/workflows/upload-daemon.yml +++ b/.github/workflows/upload-daemon.yml @@ -28,10 +28,7 @@ jobs: cargo build --release --target x86_64-unknown-linux-musl - name: Upload Linux Binary to B2 - env: - B2_ACCOUNT_ID: ${{ secrets.B2_ACCOUNT_ID }} - B2_APPLICATION_KEY: ${{ secrets.B2_APPLICATION_KEY }} run: | pip install b2 - b2 account authorize $B2_ACCOUNT_ID $B2_APPLICATION_KEY + b2 account authorize ${{ secrets.B2_ACCOUNT_ID }} ${{ secrets.B2_APPLICATION_KEY }} b2 upload-file earendil ./target/x86_64-unknown-linux-musl/release/earendil earendil-linux-amd64 From a3e28ea2f007aea4405624cdbe0b78e35ba8d7a7 Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Fri, 12 Jul 2024 20:33:00 -0400 Subject: [PATCH 6/6] change upload daemon to on push master --- .github/workflows/upload-daemon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-daemon.yml b/.github/workflows/upload-daemon.yml index f17e94d..e472241 100644 --- a/.github/workflows/upload-daemon.yml +++ b/.github/workflows/upload-daemon.yml @@ -4,7 +4,7 @@ name: Upload Daemon on: push: branches: - - upload-daemon + - master jobs: setup-build-upload-linux-daemon: