From a1fd2c9de8e88c8a979c65ea062b070c128c1057 Mon Sep 17 00:00:00 2001 From: simonsan <14062932+simonsan@users.noreply.github.com> Date: Fri, 29 Nov 2024 18:00:02 +0100 Subject: [PATCH] build: remove ci/cd support for i686-unknown-linux-gnu, armv7-unknown-linux-gnueabihf, x86_64-unknown-netbsd Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com> --- .github/workflows/cross-ci.yml | 25 ++++------ .github/workflows/nightly.yml | 28 ++++------- .github/workflows/prebuilt-pr.yml | 14 ++---- .github/workflows/release-cd.yml | 14 ++---- .github/workflows/release-ci.yml | 79 ------------------------------- Cross.toml | 6 +++ 6 files changed, 31 insertions(+), 135 deletions(-) delete mode 100644 .github/workflows/release-ci.yml diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml index 766c1ca..1e5702d 100644 --- a/.github/workflows/cross-ci.yml +++ b/.github/workflows/cross-ci.yml @@ -71,21 +71,16 @@ jobs: target: aarch64-unknown-linux-musl architecture: arm64 use-cross: true - - os: ubuntu-latest - os-name: linux - target: i686-unknown-linux-gnu - architecture: i686 - use-cross: true - - os: ubuntu-latest - os-name: netbsd - target: x86_64-unknown-netbsd - architecture: x86_64 - use-cross: true - - os: ubuntu-latest - os-name: linux - target: armv7-unknown-linux-gnueabihf - architecture: armv7 - use-cross: true + # - os: ubuntu-latest + # os-name: linux + # target: i686-unknown-linux-gnu + # architecture: i686 + # use-cross: true + # - os: ubuntu-latest + # os-name: linux + # target: armv7-unknown-linux-gnueabihf + # architecture: armv7 + # use-cross: true steps: - name: Checkout repository diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 10d7bf6..e062ec7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -31,13 +31,12 @@ jobs: architecture: x86_64 binary-postfix: ".exe" use-cross: false - # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross - # - os: windows-latest - # os-name: windows - # target: x86_64-pc-windows-gnu - # architecture: x86_64 - # binary-postfix: ".exe" - # use-cross: false + - os: windows-latest + os-name: windows + target: x86_64-pc-windows-gnu + architecture: x86_64 + binary-postfix: ".exe" + use-cross: false - os: macos-13 os-name: macos target: x86_64-apple-darwin @@ -74,21 +73,12 @@ jobs: architecture: arm64 binary-postfix: "" use-cross: true - - os: ubuntu-latest - os-name: linux - target: i686-unknown-linux-gnu - architecture: i686 - binary-postfix: "" - use-cross: true - # TODO!: This needs a fix, linking `execinfo` fails - # + Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross # - os: ubuntu-latest - # os-name: netbsd - # target: x86_64-unknown-netbsd - # architecture: x86_64 + # os-name: linux + # target: i686-unknown-linux-gnu + # architecture: i686 # binary-postfix: "" # use-cross: true - # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross # - os: ubuntu-latest # os-name: linux # target: armv7-unknown-linux-gnueabihf diff --git a/.github/workflows/prebuilt-pr.yml b/.github/workflows/prebuilt-pr.yml index 31d48b5..bace97b 100644 --- a/.github/workflows/prebuilt-pr.yml +++ b/.github/workflows/prebuilt-pr.yml @@ -68,20 +68,12 @@ jobs: architecture: arm64 binary-postfix: "" use-cross: true - - os: ubuntu-latest - os-name: linux - target: i686-unknown-linux-gnu - architecture: i686 - binary-postfix: "" - use-cross: true - # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross # - os: ubuntu-latest - # os-name: netbsd - # target: x86_64-unknown-netbsd - # architecture: x86_64 + # os-name: linux + # target: i686-unknown-linux-gnu + # architecture: i686 # binary-postfix: "" # use-cross: true - # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross # - os: ubuntu-latest # os-name: linux # target: armv7-unknown-linux-gnueabihf diff --git a/.github/workflows/release-cd.yml b/.github/workflows/release-cd.yml index d5e4174..1f4fba4 100644 --- a/.github/workflows/release-cd.yml +++ b/.github/workflows/release-cd.yml @@ -59,20 +59,12 @@ jobs: architecture: arm64 binary-postfix: "" use-cross: true - - os: ubuntu-latest - os-name: linux - target: i686-unknown-linux-gnu - architecture: i686 - binary-postfix: "" - use-cross: true - # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross # - os: ubuntu-latest - # os-name: netbsd - # target: x86_64-unknown-netbsd - # architecture: x86_64 + # os-name: linux + # target: i686-unknown-linux-gnu + # architecture: i686 # binary-postfix: "" # use-cross: true - # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross # - os: ubuntu-latest # os-name: linux # target: armv7-unknown-linux-gnueabihf diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml deleted file mode 100644 index 542a3e7..0000000 --- a/.github/workflows/release-ci.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: Check release - -on: - push: - branches: - - "release/**" - # TODO!: We might want to do it manually? Not sure. - # workflow_dispatch: - # inputs: - # crate: - # description: Crate to release - # required: true - # type: choice - # options: - # - rustic_server - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - determine-package: - name: Determine package to release - runs-on: ubuntu-latest - outputs: - package: ${{ steps.determine-package-name.outputs.package }} - steps: - - name: Determine package - id: determine-package-name - run: | - if [[ ${{ github.ref }} == *"rustic_server"* ]]; then - echo "package=rustic_server" >> $GITHUB_OUTPUT - fi - - breaking-cli: - name: Check breaking CLI changes - runs-on: ${{ matrix.job.os }} - needs: determine-package - if: needs.determine-package.outputs.package == 'rustic_server' - strategy: - matrix: - rust: [stable] - job: - # - os: macos-latest # TODO: Need to generate fixtures for macOS first - - os: ubuntu-latest - - os: windows-latest - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 - with: - toolchain: stable - - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2 - - name: Run Cargo Test - run: cargo test -r --all-targets --all-features --workspace -p ${{ needs.determine-package.outputs.package }} -- --ignored - - semver-check: - name: Check SemVer - runs-on: ubuntu-latest - needs: determine-package - strategy: - matrix: - rust: [stable] - job: - - os: ubuntu-latest - # - os: windows-latest # Panics - # - os: macos-latest # Panics - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 - with: - toolchain: stable - - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2 - - - name: Check semver - uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2 - with: - package: ${{ needs.determine-package.outputs.package }} diff --git a/Cross.toml b/Cross.toml index 22dc462..0708fb3 100644 --- a/Cross.toml +++ b/Cross.toml @@ -5,6 +5,12 @@ pre-build = [ "apt-get update && apt-get --assume-yes install nasm:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH", ] +[target.i686-unknown-linux-gnu] +pre-build = [ + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get --assume-yes install gcc-multilib-i686-linux-gnu:$CROSS_DEB_ARCH gcc-i686-linux-gnu:$CROSS_DEB_ARCH" +] + [target.x86_64-pc-windows-gnu.env] passthrough = [ "AWS_LC_SYS_PREBUILT_NASM=1",