From 7b63e15690d0cedb0c09f2d81d1d1d9b24c637bf Mon Sep 17 00:00:00 2001 From: Joel Natividad <1980690+jqnatividad@users.noreply.github.com> Date: Sat, 24 Jun 2023 18:44:18 -0400 Subject: [PATCH] remove magic from all workflows --- .../workflows/macOS-arm64-selfhosted-publish.yml | 4 ---- .../publish-linux-glibc-231-musl-1124.yml | 16 ++++++---------- .../publish-nightly-glibc-231-musl-1124.yml | 14 +++++--------- .github/workflows/publish-nightly.yml | 10 +++------- .github/workflows/publish.yml | 16 ++++++---------- .github/workflows/rust-beta.yml | 5 +---- .github/workflows/rust-nightly-bleeding-edge.yml | 2 +- .github/workflows/rust-qsvdp.yml | 5 +---- .github/workflows/rust-qsvlite.yml | 5 +---- .github/workflows/rust-to.yml | 5 +---- .github/workflows/rust.yml | 5 +---- .github/workflows/test-publish-nightly.yml | 2 +- .github/workflows/test-publish.yml | 9 ++------- 13 files changed, 29 insertions(+), 69 deletions(-) diff --git a/.github/workflows/macOS-arm64-selfhosted-publish.yml b/.github/workflows/macOS-arm64-selfhosted-publish.yml index e26aaf713..898075b2b 100644 --- a/.github/workflows/macOS-arm64-selfhosted-publish.yml +++ b/.github/workflows/macOS-arm64-selfhosted-publish.yml @@ -55,10 +55,6 @@ jobs: with: submodules: recursive ref: ${{ needs.analyze-tags.outputs.previous-tag }} - - name: Install libmagic on linux - if: ${{ matrix.job.os-name == 'linux' }} - run: | - sudo apt-get install libmagic1 libmagic-dev - name: build prep for x86_64-unknown-linux-musl if: ${{ matrix.job.musl-prep }} run: | diff --git a/.github/workflows/publish-linux-glibc-231-musl-1124.yml b/.github/workflows/publish-linux-glibc-231-musl-1124.yml index b463f85ee..a77521a48 100644 --- a/.github/workflows/publish-linux-glibc-231-musl-1124.yml +++ b/.github/workflows/publish-linux-glibc-231-musl-1124.yml @@ -33,20 +33,20 @@ jobs: os-name: linux target: x86_64-unknown-linux-gnu architecture: x86_64 - addl-build-args: --features=apply,generate,luau,fetch,foreach,self_update,magic,polars + addl-build-args: --features=apply,generate,luau,fetch,foreach,self_update,polars default-features: - addl-qsvlite-features: magic - addl-qsvdp-features: luau,magic + addl-qsvlite-features: + addl-qsvdp-features: luau name-suffix: glibc-2.31 - os: ubuntu-20.04 os-name: linux target: x86_64-unknown-linux-musl architecture: x86_64 musl-prep: true - addl-build-args: --features=apply,generate,fetch,foreach,self_update,magic + addl-build-args: --features=apply,generate,fetch,foreach,self_update default-features: - addl-qsvlite-features: magic - addl-qsvdp-features: magic + addl-qsvlite-features: + addl-qsvdp-features: name-suffix: musl-1.1.24 steps: @@ -62,10 +62,6 @@ jobs: with: submodules: recursive ref: ${{ needs.analyze-tags.outputs.previous-tag }} - - name: Install libmagic on linux - if: ${{ matrix.job.os-name == 'linux' }} - run: | - sudo apt-get install libmagic1 libmagic-dev - name: build prep for x86_64-unknown-linux-musl if: ${{ matrix.job.musl-prep }} run: | diff --git a/.github/workflows/publish-nightly-glibc-231-musl-1124.yml b/.github/workflows/publish-nightly-glibc-231-musl-1124.yml index 8fef8291c..ef97242f6 100644 --- a/.github/workflows/publish-nightly-glibc-231-musl-1124.yml +++ b/.github/workflows/publish-nightly-glibc-231-musl-1124.yml @@ -33,10 +33,10 @@ jobs: os-name: linux target: x86_64-unknown-linux-gnu architecture: x86_64 - addl-build-args: --features=apply,generate,luau,fetch,foreach,nightly,self_update,magic,polars + addl-build-args: --features=apply,generate,luau,fetch,foreach,nightly,self_update,polars default-features: - addl-qsvlite-features: magic - addl-qsvdp-features: luau,magic + addl-qsvlite-features: + addl-qsvdp-features: luau name-suffix: glibc-2.31 - os: ubuntu-20.04 os-name: linux @@ -45,8 +45,8 @@ jobs: musl-prep: true addl-build-args: --features=apply,generate,fetch,foreach,nightly,self_update,polars default-features: - addl-qsvlite-features: magic - addl-qsvdp-features: magic + addl-qsvlite-features: + addl-qsvdp-features: name-suffix: musl-1.1.24 steps: @@ -64,10 +64,6 @@ jobs: with: submodules: recursive ref: ${{ needs.analyze-tags.outputs.previous-tag }} - - name: Install libmagic on linux - if: ${{ matrix.job.os-name == 'linux' }} - run: | - sudo apt-get install libmagic1 libmagic-dev - name: build prep for x86_64-unknown-linux-musl if: ${{ matrix.job.musl-prep }} run: | diff --git a/.github/workflows/publish-nightly.yml b/.github/workflows/publish-nightly.yml index 1e552dccd..d8cc8c913 100644 --- a/.github/workflows/publish-nightly.yml +++ b/.github/workflows/publish-nightly.yml @@ -33,10 +33,10 @@ jobs: os-name: linux target: x86_64-unknown-linux-gnu architecture: x86_64 - addl-build-args: --features=apply,generate,luau,fetch,foreach,nightly,self_update,magic,polars + addl-build-args: --features=apply,generate,luau,fetch,foreach,nightly,self_update,polars default-features: - addl-qsvlite-features: magic - addl-qsvdp-features: luau,magic + addl-qsvlite-features: + addl-qsvdp-features: luau # - os: ubuntu-latest # os-name: linux # target: x86_64-unknown-linux-musl @@ -84,10 +84,6 @@ jobs: with: submodules: recursive ref: ${{ needs.analyze-tags.outputs.previous-tag }} - - name: Install libmagic on linux - if: ${{ matrix.job.os-name == 'linux' }} - run: | - sudo apt-get install libmagic1 libmagic-dev - name: build prep for x86_64-unknown-linux-musl if: ${{ matrix.job.musl-prep }} run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d9942dbb1..bd388cc83 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,20 +37,20 @@ jobs: target: x86_64-unknown-linux-gnu architecture: x86_64 use-cross: false - addl-build-args: --features=apply,generate,luau,fetch,foreach,self_update,magic,polars + addl-build-args: --features=apply,generate,luau,fetch,foreach,self_update,polars default-features: - addl-qsvlite-features: magic - addl-qsvdp-features: luau,magic + addl-qsvlite-features: + addl-qsvdp-features: luau - os: ubuntu-22.04 os-name: linux target: x86_64-unknown-linux-musl architecture: x86_64 musl-prep: true use-cross: false - addl-build-args: --features=apply,generate,fetch,foreach,self_update,magic + addl-build-args: --features=apply,generate,fetch,foreach,self_update default-features: - addl-qsvlite-features: magic - addl-qsvdp-features: magic + addl-qsvlite-features: + addl-qsvdp-features: - os: ubuntu-22.04 os-name: linux target: i686-unknown-linux-gnu @@ -142,10 +142,6 @@ jobs: with: submodules: recursive ref: ${{ needs.analyze-tags.outputs.previous-tag }} - - name: Install libmagic on linux - if: ${{ matrix.job.os-name == 'linux' }} - run: | - sudo apt-get install libmagic1 libmagic-dev - name: build prep for x86_64-unknown-linux-musl if: ${{ matrix.job.musl-prep }} run: | diff --git a/.github/workflows/rust-beta.yml b/.github/workflows/rust-beta.yml index adabcda6c..affd212bc 100644 --- a/.github/workflows/rust-beta.yml +++ b/.github/workflows/rust-beta.yml @@ -18,12 +18,9 @@ jobs: - uses: actions/setup-python@v4.6.1 with: python-version: '3.11' - - name: Install libmagic - run: | - sudo apt-get install libmagic1 libmagic-dev - name: Update Rust Beta run: | rustup update beta rustup default beta - name: Run tests - run: cargo test --verbose --features feature_capable,apply,fetch,generate,foreach,python,luau,magic,polars + run: cargo test --verbose --features feature_capable,apply,fetch,generate,foreach,python,luau,polars diff --git a/.github/workflows/rust-nightly-bleeding-edge.yml b/.github/workflows/rust-nightly-bleeding-edge.yml index 3cd51cc49..ba7675dbe 100644 --- a/.github/workflows/rust-nightly-bleeding-edge.yml +++ b/.github/workflows/rust-nightly-bleeding-edge.yml @@ -33,4 +33,4 @@ jobs: override: true default: true - name: Run tests - run: cargo test --verbose --locked --features=apply,fetch,foreach,generate,luau,python,feature_capable,nightly,magic,polars + run: cargo test --verbose --locked --features=apply,fetch,foreach,generate,luau,python,feature_capable,nightly,polars diff --git a/.github/workflows/rust-qsvdp.yml b/.github/workflows/rust-qsvdp.yml index 606e57448..6162e294d 100644 --- a/.github/workflows/rust-qsvdp.yml +++ b/.github/workflows/rust-qsvdp.yml @@ -22,12 +22,9 @@ jobs: - uses: actions/checkout@v3 - name: Update Rust run: rustup update - - name: Install libmagic - run: | - sudo apt-get install libmagic1 libmagic-dev - name: Setup Rust-cache uses: Swatinem/rust-cache@v2 with: key: qsvdp-cache - name: Run tests - run: cargo test --verbose --locked --features=datapusher_plus,luau,magic + run: cargo test --verbose --locked --features=datapusher_plus,luau diff --git a/.github/workflows/rust-qsvlite.yml b/.github/workflows/rust-qsvlite.yml index ec589f07a..27efb982c 100644 --- a/.github/workflows/rust-qsvlite.yml +++ b/.github/workflows/rust-qsvlite.yml @@ -22,12 +22,9 @@ jobs: - uses: actions/checkout@v3 - name: Update Rust run: rustup update - - name: Install libmagic - run: | - sudo apt-get install libmagic1 libmagic-dev - name: Setup Rust-cache uses: Swatinem/rust-cache@v2 with: key: qsvlite-cache - name: Run tests - run: cargo test --verbose --locked --features=lite,magic + run: cargo test --verbose --locked --features=lite diff --git a/.github/workflows/rust-to.yml b/.github/workflows/rust-to.yml index de5a18b0d..feefe701b 100644 --- a/.github/workflows/rust-to.yml +++ b/.github/workflows/rust-to.yml @@ -24,9 +24,6 @@ jobs: run: | sudo apt-get update - uses: actions/checkout@v3 - - name: Install libmagic - run: | - sudo apt-get install libmagic1 libmagic-dev - name: Update Rust run: rustup update - name: Setup Rust-cache @@ -34,4 +31,4 @@ jobs: with: key: qsvto-cache - name: Run tests - run: cargo test --verbose --locked --features=magic,to,feature_capable + run: cargo test --verbose --locked --features=to,feature_capable diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 270ee73e9..e5f9865e6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -27,9 +27,6 @@ jobs: - uses: actions/setup-python@v4.6.1 with: python-version: '3.11' - - name: Install libmagic - run: | - sudo apt-get install libmagic1 libmagic-dev - name: Install and Run Redis run: | sudo apt-get install redis-server @@ -41,4 +38,4 @@ jobs: with: key: qsv-cache - name: Run tests - run: cargo test --verbose --locked --features=apply,fetch,foreach,generate,luau,python,magic,polars,feature_capable + run: cargo test --verbose --locked --features=apply,fetch,foreach,generate,luau,python,polars,feature_capable diff --git a/.github/workflows/test-publish-nightly.yml b/.github/workflows/test-publish-nightly.yml index 4370fa649..63071bb8a 100644 --- a/.github/workflows/test-publish-nightly.yml +++ b/.github/workflows/test-publish-nightly.yml @@ -20,7 +20,7 @@ jobs: architecture: x86_64 addl-build-args: --features=apply,generate,luau,fetch,foreach,nightly,to,self_update,polars default-features: - addl-qsvdp-features: luau,magic + addl-qsvdp-features: luau # - os: ubuntu-latest # os-name: linux # target: x86_64-unknown-linux-musl diff --git a/.github/workflows/test-publish.yml b/.github/workflows/test-publish.yml index 914d8ae66..4a686aca3 100644 --- a/.github/workflows/test-publish.yml +++ b/.github/workflows/test-publish.yml @@ -19,7 +19,7 @@ jobs: target: x86_64-unknown-linux-gnu architecture: x86_64 use-cross: false - addl-build-args: --features=apply,generate,luau,fetch,foreach,self_update,to,magic + addl-build-args: --features=apply,generate,luau,fetch,foreach,self_update,to default-features: addl-qsvdp-features: luau - os: ubuntu-latest @@ -28,7 +28,7 @@ jobs: architecture: x86_64 musl-prep: true use-cross: false - addl-build-args: --features=apply,generate,fetch,foreach,self_update,magic + addl-build-args: --features=apply,generate,fetch,foreach,self_update default-features: addl-qsvdp-features: - os: ubuntu-latest @@ -126,11 +126,6 @@ jobs: run: | sudo apt-get install musl-tools musl-dev sudo ln -s /usr/bin/g++ /usr/bin/musl-g++ - - name: set MAGIC_STATIC false when cross-compiling - if: ${{ matrix.job.use-cross }} - env: - MAGIC_STATIC: false - uses: actions-rs/cargo@v1 - name: Build qsv env: RUSTFLAGS: --emit=asm