diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 312fdf2bc8..f67f6d1795 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -389,7 +389,6 @@ jobs: - { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,openssl,uudoc" , use-cross: no, workspace-tests: true, pgo: PGO } - { os: ubuntu-latest , target: x86_64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross } - { os: ubuntu-latest , target: x86_64-unknown-netbsd, features: "feat_os_unix", use-cross: use-cross , skip-tests: true , check-only: true } - # - { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true , check-only: true } - { os: ubuntu-latest , target: wasm32-wasip1, default-features: false, features: feat_wasm, skip-tests: true } - { os: ubuntu-latest , target: wasm32-wasip2, default-features: false, features: feat_wasm, skip-tests: true } - { os: macos-latest , target: aarch64-apple-darwin , features: "feat_os_unix,openssl", workspace-tests: true, pgo: PGO } # M1 CPU @@ -465,7 +464,6 @@ jobs: *-linux-*) TARGET_OS=linux ;; *-apple-*) TARGET_OS=macos ;; *-windows-*) TARGET_OS=windows ;; - *-redox*) TARGET_OS=redox ;; esac outputs TARGET_ARCH TARGET_OS # package name @@ -499,10 +497,6 @@ jobs: CARGO_CMD='cargo' ARTIFACTS_SUFFIX='-nocross' ;; - redoxer) - CARGO_CMD='redoxer' - CARGO_CMD_OPTIONS='' - ;; esac # needed for target "aarch64-apple-darwin". There are two jobs, and the difference between them is whether "features" is set if [ -z "${{ matrix.job.features }}" ]; then ARTIFACTS_SUFFIX='-nofeatures' ; fi @@ -553,10 +547,6 @@ jobs: sudo apt-get -y update sudo apt-get -y install gcc-riscv64-linux-gnu ;; - *-redox*) - sudo apt-get -y update - sudo apt-get -y install fuse3 libfuse-dev - ;; esac case '${{ matrix.job.os }}' in ubuntu-*) @@ -581,10 +571,6 @@ jobs: echo 200:x:2000: | sudo tee -a /etc/group ;; esac - - uses: taiki-e/install-action@v2 - if: steps.vars.outputs.CARGO_CMD == 'redoxer' - with: - tool: redoxer@0.2.56 - name: Initialize toolchain-dependent workflow variables id: dep_vars shell: bash diff --git a/.github/workflows/redox.yml b/.github/workflows/redox.yml new file mode 100644 index 0000000000..f06afc112e --- /dev/null +++ b/.github/workflows/redox.yml @@ -0,0 +1,30 @@ +name: Redox + +on: + pull_request: + push: + branches: + - main + +permissions: + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + +jobs: + test_redox: + name: cargo check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v7.0.1 + with: + persist-credentials: false + - uses: dtolnay/rust-toolchain@stable + with: + targets: x86_64-unknown-redox + - name: cargo check + env: + CARGO_INCREMENTAL: 0 + run: cargo check --target x86_64-unknown-redox --no-default-features --features feat_os_unix_redox diff --git a/Cargo.toml b/Cargo.toml index 6b646b5835..4285ed7057 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -668,9 +668,23 @@ feat_os_unix_fuchsia = [ # "feat_os_unix_redox" == set of utilities which can be built/run on "Redox OS" (refs: ; ) feat_os_unix_redox = [ "feat_common_core", - # + "chgrp", "chmod", + "chown", + "df", + "du", + "env", + "install", + "kill", + "logname", + "more", + "nice", + "nohup", + "nproc", "stat", + "stty", + "timeout", + "whoami", ] ## # * bypass/override ~ translate 'test' feature name to avoid dependency collision with rust core 'test' crate (o/w surfaces as compiler errors during testing)