From 6a2fd64f82dfcd6b5ff2636ec572a94e7e6e9e45 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 10:14:13 +0200 Subject: [PATCH 01/15] feat: Ship aarch64 build for linux --- .github/workflows/pr_stackablectl.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr_stackablectl.yml b/.github/workflows/pr_stackablectl.yml index bb991efb..895644c1 100644 --- a/.github/workflows/pr_stackablectl.yml +++ b/.github/workflows/pr_stackablectl.yml @@ -43,6 +43,8 @@ jobs: include: - target: x86_64-unknown-linux-gnu os: ubuntu-latest + - target: aarch64-unknown-linux-gnu + os: buildjet-4vcpu-ubuntu-2204-arm - target: x86_64-apple-darwin os: macos-latest - target: aarch64-apple-darwin From 79449a0ce614aa9897caebe9163eb88d44cd43f3 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 10:15:51 +0200 Subject: [PATCH 02/15] trigger job --- .github/workflows/pr_stackablectl.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr_stackablectl.yml b/.github/workflows/pr_stackablectl.yml index 895644c1..6e776edb 100644 --- a/.github/workflows/pr_stackablectl.yml +++ b/.github/workflows/pr_stackablectl.yml @@ -12,6 +12,8 @@ on: - "Cargo.lock" - "go.sum" - "extra/**" + # FIXME remove again + workflow_dispatch: env: RUST_VERSION: 1.75.0 From a0407c84dbb33b1d7f49ed2895b9c659c3e16e76 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 10:37:20 +0200 Subject: [PATCH 03/15] trigger ci From daf6fea92e7afc6a5bf83c6ad1531e900fc62db1 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 10:55:50 +0200 Subject: [PATCH 04/15] faster CI --- .github/workflows/pr_stackablectl.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr_stackablectl.yml b/.github/workflows/pr_stackablectl.yml index 6e776edb..ff640d39 100644 --- a/.github/workflows/pr_stackablectl.yml +++ b/.github/workflows/pr_stackablectl.yml @@ -36,9 +36,9 @@ jobs: build: name: Build stackablectl for ${{ matrix.target }} runs-on: ${{ matrix.os }} - needs: - - general-checks - - reviewdog-checks + # needs: + # - general-checks + # - reviewdog-checks strategy: fail-fast: false matrix: From 1ec1143dbfae0cbbeb59eb7003fe132bc187b1d5 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 11:04:00 +0200 Subject: [PATCH 05/15] Install go --- .github/workflows/pr_stackablectl.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pr_stackablectl.yml b/.github/workflows/pr_stackablectl.yml index ff640d39..fca0950d 100644 --- a/.github/workflows/pr_stackablectl.yml +++ b/.github/workflows/pr_stackablectl.yml @@ -62,6 +62,10 @@ jobs: toolchain: ${{ env.RUST_VERSION }} targets: ${{ matrix.target }} + - uses: actions/setup-go@v5 + with: + go-version: '^1.22.2' + - uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0 with: key: build-stackablectl-${{ matrix.target }} From b9323c05432b66ad3b7795bb55a42e1094dac2ae Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 11:09:46 +0200 Subject: [PATCH 06/15] Add to release job --- .github/workflows/release_stackablectl.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/release_stackablectl.yml b/.github/workflows/release_stackablectl.yml index 6113f9bb..06b444de 100644 --- a/.github/workflows/release_stackablectl.yml +++ b/.github/workflows/release_stackablectl.yml @@ -26,6 +26,9 @@ jobs: - target: x86_64-unknown-linux-gnu os: ubuntu-20.04 # We don't use ubuntu-latest because we want to build against an old glibc version. (18.04 has glibc 2.27, 20.04 has glibc 2.31, 22.04 has glibc 2.35) file-suffix: "" + - target: aarch64-unknown-linux-gnu + os: buildjet-4vcpu-ubuntu-2204-arm # The ARM runners only support Ubuntu 22.04, so we can't pick 20.04 + file-suffix: "" - target: x86_64-apple-darwin os: macos-latest file-suffix: "" @@ -43,6 +46,10 @@ jobs: toolchain: ${{ env.RUST_VERSION }} targets: ${{ matrix.target }} + - uses: actions/setup-go@v5 + with: + go-version: '^1.22.2' + - name: Build Binary if: matrix.os != 'windows-latest' run: cargo build --target ${{ matrix.target }} --release --package stackablectl From 1b7206ce29616276faa83d2c0a641dcf0ad409ed Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 11:10:32 +0200 Subject: [PATCH 07/15] Revert temp changes --- .github/workflows/pr_stackablectl.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr_stackablectl.yml b/.github/workflows/pr_stackablectl.yml index fca0950d..ee14d8f5 100644 --- a/.github/workflows/pr_stackablectl.yml +++ b/.github/workflows/pr_stackablectl.yml @@ -12,8 +12,6 @@ on: - "Cargo.lock" - "go.sum" - "extra/**" - # FIXME remove again - workflow_dispatch: env: RUST_VERSION: 1.75.0 @@ -36,9 +34,9 @@ jobs: build: name: Build stackablectl for ${{ matrix.target }} runs-on: ${{ matrix.os }} - # needs: - # - general-checks - # - reviewdog-checks + needs: + - general-checks + - reviewdog-checks strategy: fail-fast: false matrix: From 95da3e1cc45a80c764be93f1a009e88d330c54f4 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 11:20:35 +0200 Subject: [PATCH 08/15] trigger ci From 4b6ee613df0cdf04cbe2517b50dbbf5ab44e3433 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 12:32:36 +0200 Subject: [PATCH 09/15] trigger ci From 0b4ef302ed42b9eca3688010b9aa59145750c531 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 12:36:01 +0200 Subject: [PATCH 10/15] Try to build without "Install host dependencies", as this fails Fails with Run sudo apt-get update Get:1 file:/etc/apt/apt-mirrors.txt Mirrorlist [142 B] Get:6 https://packages.microsoft.com/ubuntu/22.04/prod jammy InRelease Err:6 https://packages.microsoft.com/ubuntu/22.04/prod jammy InRelease Clearsigned file isn't valid, got 'NOSPLIT' (does the network require authentication?) Hit:2 http://azure.archive.ubuntu.com/ubuntu jammy InRelease Get:3 http://azure.archive.ubuntu.com/ubuntu jammy-updates InRelease [119 kB] Get:4 http://azure.archive.ubuntu.com/ubuntu jammy-backports InRelease [109 kB] Get:5 http://azure.archive.ubuntu.com/ubuntu jammy-security InRelease [110 kB] Get:7 http://azure.archive.ubuntu.com/ubuntu jammy-updates/main amd64 Packages [1610 kB] Get:8 http://azure.archive.ubuntu.com/ubuntu jammy-updates/main Translation-en [303 kB] Get:9 http://azure.archive.ubuntu.com/ubuntu jammy-updates/restricted amd64 Packages [1830 kB] Get:10 http://azure.archive.ubuntu.com/ubuntu jammy-updates/restricted Translation-en [311 kB] Get:11 http://azure.archive.ubuntu.com/ubuntu jammy-updates/universe amd64 Packages [1070 kB] Get:12 http://azure.archive.ubuntu.com/ubuntu jammy-updates/universe Translation-en [244 kB] Get:13 http://azure.archive.ubuntu.com/ubuntu jammy-backports/universe amd64 Packages [27.2 kB] Get:14 http://azure.archive.ubuntu.com/ubuntu jammy-backports/universe Translation-en [16.2 kB] Hit:15 https://ppa.launchpadcontent.net/ubuntu-toolchain-r/test/ubuntu jammy InRelease Get:16 http://azure.archive.ubuntu.com/ubuntu jammy-security/main amd64 Packages [1392 kB] Get:17 http://azure.archive.ubuntu.com/ubuntu jammy-security/main Translation-en [243 kB] Get:18 http://azure.archive.ubuntu.com/ubuntu jammy-security/restricted amd64 Packages [1768 kB] Get:19 http://azure.archive.ubuntu.com/ubuntu jammy-security/restricted Translation-en [299 kB] Get:20 http://azure.archive.ubuntu.com/ubuntu jammy-security/universe amd64 Packages [848 kB] Get:21 http://azure.archive.ubuntu.com/ubuntu jammy-security/universe Translation-en [163 kB] Reading package lists... E: Failed to fetch https://packages.microsoft.com/ubuntu/22.04/prod/dists/jammy/InRelease Clearsigned file isn't valid, got 'NOSPLIT' (does the network require authentication?) E: The repository 'https://packages.microsoft.com/ubuntu/22.04/prod jammy InRelease' is no longer signed. Error: Process completed with exit code 100. --- .github/workflows/pr_general.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pr_general.yml b/.github/workflows/pr_general.yml index 0239a31e..5eed611e 100644 --- a/.github/workflows/pr_general.yml +++ b/.github/workflows/pr_general.yml @@ -19,10 +19,6 @@ jobs: env: RUSTC_BOOTSTRAP: 1 steps: - - name: Install host dependencies - run: | - sudo apt-get update - sudo apt-get install protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: submodules: recursive From 8614c03fb267e0284d974d9291fae8cc695e4591 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 12:52:00 +0200 Subject: [PATCH 11/15] Use fixed hash for action --- .github/actionlint.yaml | 5 +++++ .github/workflows/pr_stackablectl.yml | 2 +- .github/workflows/release_stackablectl.yml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .github/actionlint.yaml diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml new file mode 100644 index 00000000..1dbd7ae1 --- /dev/null +++ b/.github/actionlint.yaml @@ -0,0 +1,5 @@ +self-hosted-runner: + # BuildJet machines we are using + labels: + - buildjet-2vcpu-ubuntu-2204-arm + - buildjet-4vcpu-ubuntu-2204-arm diff --git a/.github/workflows/pr_stackablectl.yml b/.github/workflows/pr_stackablectl.yml index ee14d8f5..b62f86bf 100644 --- a/.github/workflows/pr_stackablectl.yml +++ b/.github/workflows/pr_stackablectl.yml @@ -60,7 +60,7 @@ jobs: toolchain: ${{ env.RUST_VERSION }} targets: ${{ matrix.target }} - - uses: actions/setup-go@v5 + - uses: actions/setup-go0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 with: go-version: '^1.22.2' diff --git a/.github/workflows/release_stackablectl.yml b/.github/workflows/release_stackablectl.yml index 06b444de..546291d7 100644 --- a/.github/workflows/release_stackablectl.yml +++ b/.github/workflows/release_stackablectl.yml @@ -46,7 +46,7 @@ jobs: toolchain: ${{ env.RUST_VERSION }} targets: ${{ matrix.target }} - - uses: actions/setup-go@v5 + - uses: actions/setup-go0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 with: go-version: '^1.22.2' From a5117674bda61042c567d3ca9e88b3b2ccffc134 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 12:53:05 +0200 Subject: [PATCH 12/15] fixup --- .github/workflows/pr_stackablectl.yml | 2 +- .github/workflows/release_stackablectl.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr_stackablectl.yml b/.github/workflows/pr_stackablectl.yml index b62f86bf..dd675e50 100644 --- a/.github/workflows/pr_stackablectl.yml +++ b/.github/workflows/pr_stackablectl.yml @@ -60,7 +60,7 @@ jobs: toolchain: ${{ env.RUST_VERSION }} targets: ${{ matrix.target }} - - uses: actions/setup-go0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 + - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 with: go-version: '^1.22.2' diff --git a/.github/workflows/release_stackablectl.yml b/.github/workflows/release_stackablectl.yml index 546291d7..ff1b52f6 100644 --- a/.github/workflows/release_stackablectl.yml +++ b/.github/workflows/release_stackablectl.yml @@ -46,7 +46,7 @@ jobs: toolchain: ${{ env.RUST_VERSION }} targets: ${{ matrix.target }} - - uses: actions/setup-go0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 + - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 with: go-version: '^1.22.2' From 71f8979157aba247460e5bad5d8db0022c4f3b56 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 12:54:48 +0200 Subject: [PATCH 13/15] trigger ci From acbeda624fc88208be0eade7028cf7088ab3c702 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 12:57:39 +0200 Subject: [PATCH 14/15] yolo From dd485246e9084404aeda3b4f508b7fbb0c0bd453 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 24 Apr 2024 13:51:55 +0200 Subject: [PATCH 15/15] Update .github/actionlint.yaml Co-authored-by: Techassi --- .github/actionlint.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 1dbd7ae1..aa2d2b97 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -1,3 +1,4 @@ +--- self-hosted-runner: # BuildJet machines we are using labels: