Add publish step with all Tier 1 targets, fix concurrency flag

BitpingApp · Nov 18, 2024 · 72d4463 · 72d4463
1 parent d773e55
commit 72d4463
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/rust-publish.yml b/.github/workflows/rust-publish.yml
@@ -41,17 +41,20 @@ jobs:
             os: ubuntu-latest
             asset_name: bping-aarch64-linux-gnu
             gcc_package: gcc-aarch64-linux-gnu
+            linker: aarch64-linux-gnu-gcc
           - target: aarch64-apple-darwin
             os: macos-latest
             asset_name: bping-aarch64-darwin
           - target: arm-unknown-linux-gnueabi
             os: ubuntu-latest
             asset_name: bping-arm-linux-gnueabi
             gcc_package: gcc-arm-linux-gnueabi
+            linker: arm-linux-gnueabi-gcc
           - target: armv7-unknown-linux-gnueabihf
             os: ubuntu-latest
             asset_name: bping-armv7-linux-gnueabihf
             gcc_package: gcc-arm-linux-gnueabihf
+            linker: arm-linux-gnueabihf-gcc
           - target: x86_64-unknown-linux-musl
             os: ubuntu-latest
             asset_name: bping-x86_64-linux-musl
@@ -69,6 +72,13 @@ jobs:
             sudo apt-get install -y ${{ matrix.gcc_package }}
           fi
 
+      - name: Configure Cargo for cross-compilation
+        if: matrix.linker != ''
+        run: |
+          mkdir -p ~/.cargo
+          echo "[target.${{ matrix.target }}]" >> ~/.cargo/config.toml
+          echo "linker = \"${{ matrix.linker }}\"" >> ~/.cargo/config.toml
+
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -110,7 +120,7 @@ jobs:
         if: runner.os != 'Windows'
         run: |
           if [ "${{ matrix.target }}" != "aarch64-apple-darwin" ]; then
-            if [ -n "${{ matrix.gcc_package }}" ]; then
+            if [ -n "${{ matrix.linker }}" ]; then
               ${{ matrix.target }}-strip target/${{ matrix.target }}/release/bping
             else
               strip target/${{ matrix.target }}/release/bping

diff --git a/src/options/opts.rs b/src/options/opts.rs
@@ -57,9 +57,9 @@ impl Opts {
             regions,
             count,
             attempts,
+            concurrency,
             api_key,
             endpoint,
-            concurrency
         })
         .to_options()
         .descr("A command line utility to ping a website from anywhere in the world!")