From a8d8b655a571322e722ac90b214d3c34ce2c3d6d Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:15:12 -0400 Subject: [PATCH 01/21] test AUv2 with debug build --- .github/pull_request_template.md | 1 - Makefile.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1e621c6c..a53397f4 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -20,7 +20,6 @@ Long form explanations of most of the items below can be found in the [CONTRIBUT - [ ] update [example config file section](https://epi052.github.io/feroxbuster-docs/docs/configuration/ferox-config-toml/) - [ ] update [help output section](https://epi052.github.io/feroxbuster-docs/docs/configuration/command-line/) - [ ] add an [example](https://epi052.github.io/feroxbuster-docs/docs/examples/) - - [ ] update [comparison table](https://epi052.github.io/feroxbuster-docs/docs/compare/) ## Additional Tests - [ ] New code is unit tested diff --git a/Makefile.toml b/Makefile.toml index 49b8df0b..92df1386 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -37,5 +37,5 @@ cargo fmt --all [tasks.test] clear = true script = """ -cargo nextest run --all-features --all-targets +cargo nextest run --all-features --all-targets --retries 4 --no-fail-fast """ From 36081fd6ebdf46983bcc45cdad34c928238e3d5a Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:16:13 -0400 Subject: [PATCH 02/21] updated AU to v4 for build pipeline; test 1 --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f93f59cf..8549a7ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,11 +63,11 @@ jobs: if: matrix.type == 'ubuntu-x64' run: | tar czf ${{ matrix.name }}.tar.gz -C target/x86_64-unknown-linux-musl/release feroxbuster - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: ${{ matrix.name }} path: ${{ matrix.path }} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: matrix.type == 'ubuntu-x64' with: name: ${{ matrix.name }}.tar.gz @@ -97,7 +97,7 @@ jobs: use-cross: true command: build args: --target=x86_64-unknown-linux-musl - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: x86_64-linux-debug-feroxbuster path: target/x86_64-unknown-linux-musl/debug/feroxbuster @@ -120,7 +120,7 @@ jobs: - name: Deb Build run: cargo deb --target=x86_64-unknown-linux-musl - name: Upload Deb Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: feroxbuster_amd64.deb path: ./target/x86_64-unknown-linux-musl/debian/* @@ -148,11 +148,11 @@ jobs: - name: Build tar.gz for homebrew installs run: | tar czf x86_64-macos-feroxbuster.tar.gz -C target/x86_64-apple-darwin/release feroxbuster - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: x86_64-macos-feroxbuster path: target/x86_64-apple-darwin/release/feroxbuster - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: x86_64-macos-feroxbuster.tar.gz path: x86_64-macos-feroxbuster.tar.gz @@ -180,11 +180,11 @@ jobs: - name: Build tar.gz for homebrew installs run: | tar czf aarch64-macos-feroxbuster.tar.gz -C target/aarch64-apple-darwin/release feroxbuster - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: aarch64-macos-feroxbuster path: target/aarch64-apple-darwin/release/feroxbuster - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: aarch64-macos-feroxbuster.tar.gz path: aarch64-macos-feroxbuster.tar.gz @@ -220,7 +220,7 @@ jobs: use-cross: true command: build args: --release --target=${{ matrix.target }} - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: ${{ matrix.name }} path: ${{ matrix.path }} From f96466d5f02d1b0c48b80e83bd61012446b31f5b Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:26:00 -0400 Subject: [PATCH 03/21] upgraded checkout from v2 to v4; test 1 --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8549a7ce..0e309a77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: path: target/aarch64-unknown-linux-gnu/release/feroxbuster pkg_config_path: /usr/lib/x86_64-linux-gnu/pkgconfig steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install System Dependencies run: | env @@ -78,7 +78,7 @@ jobs: IN_PIPELINE: true runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install System Dependencies run: | env @@ -131,7 +131,7 @@ jobs: runs-on: macos-latest if: github.ref == 'refs/heads/main' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -163,7 +163,7 @@ jobs: runs-on: macos-latest # if: github.ref == 'refs/heads/main' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -209,7 +209,7 @@ jobs: name: x86-windows-feroxbuster.exe path: target\i686-pc-windows-msvc\release\feroxbuster.exe steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable From 4f83b30424420d26b8b42ceee936307419b619e8 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:39:02 -0400 Subject: [PATCH 04/21] migrating from actions-rs to dtolnay stuff; test 1 --- .github/workflows/build.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e309a77..fb30657f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,19 +84,18 @@ jobs: env sudo apt-get update sudo apt-get install -y --no-install-recommends libssl-dev pkg-config - - uses: actions-rs/toolchain@v1 + - name: Set up Rust toolchain + uses: actions/rust-toolchain@v1 with: toolchain: stable + components: rustfmt, clippy target: x86_64-unknown-linux-musl - override: true - - uses: actions-rs/cargo@v1 + + - name: Build the project env: PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig OPENSSL_DIR: /usr/lib/ssl - with: - use-cross: true - command: build - args: --target=x86_64-unknown-linux-musl + run: cargo build --target=x86_64-unknown-linux-musl - uses: actions/upload-artifact@v4 with: name: x86_64-linux-debug-feroxbuster From 8599c8717402e6807d596e9ccd9ae590c97ca760 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:44:10 -0400 Subject: [PATCH 05/21] migrating from actions-rs to dtolnay stuff; test 2 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb30657f..e25f815c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,16 +79,16 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install System Dependencies run: | env sudo apt-get update sudo apt-get install -y --no-install-recommends libssl-dev pkg-config - name: Set up Rust toolchain - uses: actions/rust-toolchain@v1 + uses: dtolnay/rust-toolchain@master with: toolchain: stable - components: rustfmt, clippy target: x86_64-unknown-linux-musl - name: Build the project From 8daada6690b9df271cdbc6346d3d7dee93abe1e6 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:46:40 -0400 Subject: [PATCH 06/21] migrating from actions-rs to dtolnay stuff; test 3 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e25f815c..16ba0385 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,7 @@ jobs: run: | env sudo apt-get update - sudo apt-get install -y --no-install-recommends libssl-dev pkg-config + sudo apt-get install -y --no-install-recommends libssl-dev pkg-config musl-tools - name: Set up Rust toolchain uses: dtolnay/rust-toolchain@master with: @@ -95,7 +95,7 @@ jobs: env: PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig OPENSSL_DIR: /usr/lib/ssl - run: cargo build --target=x86_64-unknown-linux-musl + run: cargo build --release --target=x86_64-unknown-linux-musl - uses: actions/upload-artifact@v4 with: name: x86_64-linux-debug-feroxbuster From 1206ca835e63a165b4a24957ec03d9c1ecf73c1a Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:52:21 -0400 Subject: [PATCH 07/21] migrating from actions-rs to dtolnay stuff; matrix build; test 1 --- .github/workflows/build.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16ba0385..e13a7e84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: env: IN_PIPELINE: true runs-on: ${{ matrix.os }} - if: github.ref == 'refs/heads/main' + # if: github.ref == 'refs/heads/main' strategy: matrix: type: [ubuntu-x64, ubuntu-x86, armv7, aarch64] @@ -42,20 +42,18 @@ jobs: run: | env sudo apt-get update - sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu - - uses: actions-rs/toolchain@v1 + sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools + - name: Set up Rust toolchain + uses: dtolnay/rust-toolchain@master with: toolchain: stable target: ${{ matrix.target }} - override: true - - uses: actions-rs/cargo@v1 + + - name: Build the project env: PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }} OPENSSL_DIR: /usr/lib/ssl - with: - use-cross: true - command: build - args: --release --target=${{ matrix.target }} + run: cargo build --release --target=${{ matrix.target }} - name: Strip symbols from binary run: | strip -s ${{ matrix.path }} || arm-linux-gnueabihf-strip -s ${{ matrix.path }} || aarch64-linux-gnu-strip -s ${{ matrix.path }} @@ -95,7 +93,7 @@ jobs: env: PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig OPENSSL_DIR: /usr/lib/ssl - run: cargo build --release --target=x86_64-unknown-linux-musl + run: cargo build --target=x86_64-unknown-linux-musl - uses: actions/upload-artifact@v4 with: name: x86_64-linux-debug-feroxbuster @@ -107,7 +105,7 @@ jobs: env: IN_PIPELINE: true steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - name: Install cargo-deb run: cargo install -f cargo-deb - uses: awalsh128/cache-apt-pkgs-action@v1 From fd58223d24a9dedd8b75671bd01e0fba03eb31df Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:55:28 -0400 Subject: [PATCH 08/21] migrating from actions-rs to dtolnay stuff; matrix build; test 2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e13a7e84..b18960b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: run: | env sudo apt-get update - sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools + sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools gcc-multilib - name: Set up Rust toolchain uses: dtolnay/rust-toolchain@master with: From 5bbbcc87b01046fa26ed0357a22224cb7fad936a Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 14:57:25 -0400 Subject: [PATCH 09/21] migrating from actions-rs to dtolnay stuff; matrix build; test 3 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b18960b1..68cafe4a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,8 @@ jobs: run: | env sudo apt-get update - sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools gcc-multilib + # sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools gcc-multilib + sudo apt-get install -y --no-install-recommends libssl-dev pkg-config musl-tools gcc-multilib - name: Set up Rust toolchain uses: dtolnay/rust-toolchain@master with: From 24617a63ac28ec08a4712a2437d82491e0ef3bea Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:02:24 -0400 Subject: [PATCH 10/21] migrating from actions-rs to dtolnay stuff; matrix build; test 4 --- .github/workflows/build.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68cafe4a..e8f4cc71 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,19 +42,18 @@ jobs: run: | env sudo apt-get update - # sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools gcc-multilib - sudo apt-get install -y --no-install-recommends libssl-dev pkg-config musl-tools gcc-multilib + sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools - name: Set up Rust toolchain uses: dtolnay/rust-toolchain@master - with: - toolchain: stable - target: ${{ matrix.target }} - - - name: Build the project env: PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }} OPENSSL_DIR: /usr/lib/ssl - run: cargo build --release --target=${{ matrix.target }} + with: + toolchain: stable + run: \ + cargo install cross --git https://github.com/cross-rs/cross + cross build --target ${{ matrix.target }} --release + - name: Strip symbols from binary run: | strip -s ${{ matrix.path }} || arm-linux-gnueabihf-strip -s ${{ matrix.path }} || aarch64-linux-gnu-strip -s ${{ matrix.path }} From 4b613b716c129fc712cd480d792bd4b28cc5ac93 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:22:37 -0400 Subject: [PATCH 11/21] migrating from actions-rs to dtolnay stuff; matrix build; test 5 --- .github/workflows/build-release.yml | 14 +++++++++ .github/workflows/build.yml | 47 ++++++++++++++++++----------- 2 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/build-release.yml diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 00000000..65070dfc --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,14 @@ +jobs: + release: + name: Release - ${{ matrix.platform.os_name }} + # if: startsWith( github.ref, 'refs/tags/v' ) || github.ref == 'refs/tags/test-release' + strategy: + matrix: + platform: + - os_name: Linux-x86_64 + os: ubuntu-latest + target: x86_64-unknown-linux-musl + bin: ubi + name: ubi-Linux-x86_64-musl.tar.gz + cross: false + cargo_command: cargo diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8f4cc71..846b28fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,8 @@ name: CD Pipeline on: [push] jobs: - build-nix: + build-nix-release: + name: Release - ${{ matrix.os }} env: IN_PIPELINE: true runs-on: ${{ matrix.os }} @@ -38,25 +39,37 @@ jobs: pkg_config_path: /usr/lib/x86_64-linux-gnu/pkgconfig steps: - uses: actions/checkout@v4 - - name: Install System Dependencies - run: | - env - sudo apt-get update - sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools - - name: Set up Rust toolchain - uses: dtolnay/rust-toolchain@master - env: - PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }} - OPENSSL_DIR: /usr/lib/ssl + - name: Cache cargo & target directories + uses: Swatinem/rust-cache@v2 + - name: Build binary + uses: houseabsolute/actions-rust-cross@v0 with: + command: build + target: ${{ matrix.target }} + args: "--locked --release" + strip: true toolchain: stable - run: \ - cargo install cross --git https://github.com/cross-rs/cross - cross build --target ${{ matrix.target }} --release - - name: Strip symbols from binary - run: | - strip -s ${{ matrix.path }} || arm-linux-gnueabihf-strip -s ${{ matrix.path }} || aarch64-linux-gnu-strip -s ${{ matrix.path }} + # - uses: actions/checkout@v4 + # - name: Install System Dependencies + # run: | + # env + # sudo apt-get update + # sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools + # - name: Set up Rust toolchain + # uses: dtolnay/rust-toolchain@master + # env: + # PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }} + # OPENSSL_DIR: /usr/lib/ssl + # with: + # toolchain: stable + # run: \ + # cargo install cross --git https://github.com/cross-rs/cross + # cross build --target ${{ matrix.target }} --release + + # - name: Strip symbols from binary + # run: | + # strip -s ${{ matrix.path }} || arm-linux-gnueabihf-strip -s ${{ matrix.path }} || aarch64-linux-gnu-strip -s ${{ matrix.path }} - name: Build tar.gz for homebrew installs if: matrix.type == 'ubuntu-x64' run: | From 4f959f926d0c6929caa38aa51b59214cd1b68d29 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:25:15 -0400 Subject: [PATCH 12/21] migrating from actions-rs to dtolnay stuff; matrix build; test 6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 846b28fe..ec86b5f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: CD Pipeline on: [push] jobs: - build-nix-release: + build-nix: name: Release - ${{ matrix.os }} env: IN_PIPELINE: true From a0a836695fe3b258fb4218bee3f2506ff6b30537 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:34:55 -0400 Subject: [PATCH 13/21] migrating from actions-rs to dtolnay stuff; matrix build; test 7 --- .github/workflows/build.yml | 79 ++++++++++++------------------------- 1 file changed, 26 insertions(+), 53 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec86b5f6..12ff78fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,27 +49,6 @@ jobs: args: "--locked --release" strip: true toolchain: stable - - # - uses: actions/checkout@v4 - # - name: Install System Dependencies - # run: | - # env - # sudo apt-get update - # sudo apt-get install -y --no-install-recommends libssl-dev pkg-config gcc-arm-linux-gnueabihf gcc-aarch64-linux-gnu musl-tools - # - name: Set up Rust toolchain - # uses: dtolnay/rust-toolchain@master - # env: - # PKG_CONFIG_PATH: ${{ matrix.pkg_config_path }} - # OPENSSL_DIR: /usr/lib/ssl - # with: - # toolchain: stable - # run: \ - # cargo install cross --git https://github.com/cross-rs/cross - # cross build --target ${{ matrix.target }} --release - - # - name: Strip symbols from binary - # run: | - # strip -s ${{ matrix.path }} || arm-linux-gnueabihf-strip -s ${{ matrix.path }} || aarch64-linux-gnu-strip -s ${{ matrix.path }} - name: Build tar.gz for homebrew installs if: matrix.type == 'ubuntu-x64' run: | @@ -139,22 +118,19 @@ jobs: env: IN_PIPELINE: true runs-on: macos-latest - if: github.ref == 'refs/heads/main' + # if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: x86_64-apple-darwin - override: true - - uses: actions-rs/cargo@v1 + - name: Cache cargo & target directories + uses: Swatinem/rust-cache@v2 + - name: Build binary + uses: houseabsolute/actions-rust-cross@v0 with: - use-cross: true command: build - args: --release --target=x86_64-apple-darwin - - name: Strip symbols from binary - run: | - strip -u -r target/x86_64-apple-darwin/release/feroxbuster + target: x86_64-apple-darwin + args: "--locked --release" + strip: true + toolchain: stable - name: Build tar.gz for homebrew installs run: | tar czf x86_64-macos-feroxbuster.tar.gz -C target/x86_64-apple-darwin/release feroxbuster @@ -174,19 +150,16 @@ jobs: # if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: aarch64-apple-darwin - override: true - - uses: actions-rs/cargo@v1 + - name: Cache cargo & target directories + uses: Swatinem/rust-cache@v2 + - name: Build binary + uses: houseabsolute/actions-rust-cross@v0 with: - use-cross: true command: build - args: --release --target=aarch64-apple-darwin - - name: Strip symbols from binary - run: | - strip -u -r target/aarch64-apple-darwin/release/feroxbuster + target: aarch64-apple-darwin + args: "--locked --release" + strip: true + toolchain: stable - name: Build tar.gz for homebrew installs run: | tar czf aarch64-macos-feroxbuster.tar.gz -C target/aarch64-apple-darwin/release feroxbuster @@ -203,7 +176,7 @@ jobs: env: IN_PIPELINE: true runs-on: ${{ matrix.os }} - if: github.ref == 'refs/heads/main' + # if: github.ref == 'refs/heads/main' strategy: matrix: type: [windows-x64, windows-x86] @@ -220,16 +193,16 @@ jobs: path: target\i686-pc-windows-msvc\release\feroxbuster.exe steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.target }} - override: true - - uses: actions-rs/cargo@v1 + - name: Cache cargo & target directories + uses: Swatinem/rust-cache@v2 + - name: Build binary + uses: houseabsolute/actions-rust-cross@v0 with: - use-cross: true command: build - args: --release --target=${{ matrix.target }} + target: ${{ matrix.target }} + args: "--locked --release" + strip: true + toolchain: stable - uses: actions/upload-artifact@v4 with: name: ${{ matrix.name }} From 05d550c7f8b4f4599e8e4cab1661551f333ecba0 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:45:15 -0400 Subject: [PATCH 14/21] updated ci pipeline --- .github/workflows/check.yml | 39 +++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 76bf7560..fc811ff2 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -7,40 +7,41 @@ jobs: name: Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/cargo@v1 - with: - command: check + - uses: actions/checkout@v4 + - name: Cache cargo & target directories + uses: Swatinem/rust-cache@v2 + - uses: dtolnay/rust-toolchain@stable + - run: cargo check test: name: Test Suite runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + - name: Cache cargo & target directories + uses: Swatinem/rust-cache@v2 - name: Install latest nextest release uses: taiki-e/install-action@nextest - name: Test with latest nextest release - uses: actions-rs/cargo@v1 - with: - command: nextest - args: run --all-features --all-targets + - uses: dtolnay/rust-toolchain@stable + - run: cargo nextest run --all-features --all-targets --retries 4 --no-fail-fast fmt: name: Rust fmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + - uses: actions/checkout@v4 + - name: Cache cargo & target directories + uses: Swatinem/rust-cache@v2 + - uses: dtolnay/rust-toolchain@stable + - run: cargo fmt run --all -- --check clippy: name: Clippy runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --all-targets --all-features -- -D warnings + - uses: actions/checkout@v4 + - name: Cache cargo & target directories + uses: Swatinem/rust-cache@v2 + - uses: dtolnay/rust-toolchain@stable + - run: cargo clippy --all-targets --all-features -- -D warnings From 30877cadb8bb0e8674bca2f7963293c112483b85 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:47:47 -0400 Subject: [PATCH 15/21] updated ci pipeline; test 2 --- .github/workflows/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index fc811ff2..a7573571 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -23,8 +23,8 @@ jobs: - name: Install latest nextest release uses: taiki-e/install-action@nextest - name: Test with latest nextest release - - uses: dtolnay/rust-toolchain@stable - - run: cargo nextest run --all-features --all-targets --retries 4 --no-fail-fast + uses: dtolnay/rust-toolchain@stable + run: cargo nextest run --all-features --all-targets --retries 4 --no-fail-fast fmt: name: Rust fmt From 08b3534c33b0eae78b56ffd9b959067de3d9bc33 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:48:06 -0400 Subject: [PATCH 16/21] remove cruft --- .github/workflows/build-release.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .github/workflows/build-release.yml diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml deleted file mode 100644 index 65070dfc..00000000 --- a/.github/workflows/build-release.yml +++ /dev/null @@ -1,14 +0,0 @@ -jobs: - release: - name: Release - ${{ matrix.platform.os_name }} - # if: startsWith( github.ref, 'refs/tags/v' ) || github.ref == 'refs/tags/test-release' - strategy: - matrix: - platform: - - os_name: Linux-x86_64 - os: ubuntu-latest - target: x86_64-unknown-linux-musl - bin: ubi - name: ubi-Linux-x86_64-musl.tar.gz - cross: false - cargo_command: cargo From c0243475e47d5a2dff20bc60e69ddfc156f4e9a3 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:50:54 -0400 Subject: [PATCH 17/21] updated ci pipeline; test 3 --- .github/workflows/build.yml | 8 ++++---- .github/workflows/check.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12ff78fd..025bc524 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: env: IN_PIPELINE: true runs-on: ${{ matrix.os }} - # if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' strategy: matrix: type: [ubuntu-x64, ubuntu-x86, armv7, aarch64] @@ -118,7 +118,7 @@ jobs: env: IN_PIPELINE: true runs-on: macos-latest - # if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v4 - name: Cache cargo & target directories @@ -147,7 +147,7 @@ jobs: env: IN_PIPELINE: true runs-on: macos-latest - # if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v4 - name: Cache cargo & target directories @@ -176,7 +176,7 @@ jobs: env: IN_PIPELINE: true runs-on: ${{ matrix.os }} - # if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' strategy: matrix: type: [windows-x64, windows-x86] diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a7573571..fc5849be 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -22,8 +22,8 @@ jobs: uses: Swatinem/rust-cache@v2 - name: Install latest nextest release uses: taiki-e/install-action@nextest + - uses: dtolnay/rust-toolchain@stable - name: Test with latest nextest release - uses: dtolnay/rust-toolchain@stable run: cargo nextest run --all-features --all-targets --retries 4 --no-fail-fast fmt: From 5acaf47db447283b6f86c3b07324e360658bc4b1 Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:53:49 -0400 Subject: [PATCH 18/21] updated ci pipeline; test 4 --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index fc5849be..fd6568cc 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -34,7 +34,7 @@ jobs: - name: Cache cargo & target directories uses: Swatinem/rust-cache@v2 - uses: dtolnay/rust-toolchain@stable - - run: cargo fmt run --all -- --check + - run: cargo fmt --all -- --check clippy: name: Clippy From 34a9eb236bc18ac404f90ea682b8cae6c4b10b4a Mon Sep 17 00:00:00 2001 From: epi Date: Sat, 14 Sep 2024 22:57:49 -0400 Subject: [PATCH 19/21] updated the rest --- .github/workflows/cicd-to-dockerhub.yml | 8 ++++---- .github/workflows/coverage.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cicd-to-dockerhub.yml b/.github/workflows/cicd-to-dockerhub.yml index 863c5084..dd6d00fa 100644 --- a/.github/workflows/cicd-to-dockerhub.yml +++ b/.github/workflows/cicd-to-dockerhub.yml @@ -9,21 +9,21 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Build and push id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: context: ./ file: ./Dockerfile diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 4a37b89d..1d689738 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -7,7 +7,7 @@ jobs: name: LLVM Coverage runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: components: llvm-tools-preview From 0cee8d4a7dda7eeb4743bbbd6dfd5c8772393b33 Mon Sep 17 00:00:00 2001 From: epi Date: Sun, 15 Sep 2024 05:24:23 -0400 Subject: [PATCH 20/21] updated the rest; test 2 --- .github/workflows/build.yml | 1 - .github/workflows/coverage.yml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 025bc524..7f408422 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,6 @@ on: [push] jobs: build-nix: - name: Release - ${{ matrix.os }} env: IN_PIPELINE: true runs-on: ${{ matrix.os }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 1d689738..42d1b08d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -16,9 +16,9 @@ jobs: with: tool: cargo-nextest,cargo-llvm-cov - name: Generate code coverage - run: cargo llvm-cov nextest --all-features --no-fail-fast --lcov --output-path lcov.info + run: cargo llvm-cov nextest --all-features --no-fail-fast --lcov --retries 4 --output-path lcov.info - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: lcov.info fail_ci_if_error: true From 56d0ebaa59d68545e7ee2c6a61fdc7834d1f510a Mon Sep 17 00:00:00 2001 From: epi Date: Sun, 15 Sep 2024 05:37:02 -0400 Subject: [PATCH 21/21] updated codecov action --- .github/workflows/coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 42d1b08d..52260a1d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -22,3 +22,4 @@ jobs: with: files: lcov.info fail_ci_if_error: true + token: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file