From bf7ae3f74801a7c5692afef9839152a1c00ddac4 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Wed, 19 Jul 2023 01:10:20 +0530 Subject: [PATCH] Give up on the new platforms --- .github/workflows/cd.yml | 38 +++++++++++++++-------------------- .github/workflows/ci.yml | 36 ++++++++++++++------------------- docs/en/src/install.md | 43 ---------------------------------------- 3 files changed, 31 insertions(+), 86 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 79461ca..95f396f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -19,7 +19,7 @@ jobs: - linux-musl - aarch64-linux # - aarch64-linux-musl - - aarch64-android + # - aarch64-android # - armv7-linux rust: [stable] include: @@ -28,42 +28,36 @@ jobs: - build: macos os: macos-latest target: x86_64-apple-darwin - binary_postfix: "" - build: macos-aarch64 os: macos-latest target: aarch64-apple-darwin - binary_postfix: "" - build: linux os: ubuntu-latest target: x86_64-unknown-linux-gnu - binary_postfix: "" - build: linux-musl os: ubuntu-latest target: x86_64-unknown-linux-musl - binary_postfix: "" - - build: aarch64-linux - os: ubuntu-latest - target: aarch64-unknown-linux-gnu - binary_postfix: "" + # TODO: make these work + # + # - build: aarch64-linux + # os: ubuntu-latest + # target: aarch64-unknown-linux-gnu # - build: aarch64-linux-musl # os: ubuntu-latest # target: aarch64-unknown-linux-musl - # binary_postfix: "" - - build: aarch64-android - os: ubuntu-latest - target: aarch64-linux-android - binary_postfix: "" + # - build: aarch64-android + # os: ubuntu-latest + # target: aarch64-linux-android # - build: armv7-linux # os: ubuntu-latest # target: armv7-unknown-linux-gnueabihf - # binary_postfix: "" steps: - uses: actions/checkout@v3 @@ -82,13 +76,13 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update --fix-missing - sudo apt-get install -y --no-install-recommends liblua5.1-0-dev libluajit-5.1-dev - - - if: matrix.os == 'ubuntu-latest' && contains(matrix.build, 'armv7') - run: sudo apt-get install -y --no-install-recommends gcc-arm-linux-gnueabihf libc-dev-armhf-cross + sudo apt-get install -y --no-install-recommends liblua5.1-0-dev libluajit-5.1-dev gcc musl-tools pkg-config - - if: matrix.os == 'ubuntu-latest' && contains(matrix.build, 'aarch64') - run: sudo apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu libc6-dev-arm64-cross + # - if: matrix.os == 'ubuntu-latest' && contains(matrix.build, 'armv7') + # run: sudo apt-get install -y --no-install-recommends gcc-arm-linux-gnueabihf libc-dev-armhf-cross + # + # - if: matrix.os == 'ubuntu-latest' && contains(matrix.build, 'aarch64') + # run: sudo apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu libc6-dev-arm64-cross - name: Running cargo build run: cargo build --locked --release --target ${{ matrix.target }} @@ -102,7 +96,7 @@ jobs: shell: bash run: | cd target/${{ matrix.target }}/release - BINARY_NAME=xplr${{ matrix.binary_postfix }} + BINARY_NAME=xplr strip $BINARY_NAME RELEASE_NAME=xplr-${{ matrix.build }} tar czvf $RELEASE_NAME.tar.gz $BINARY_NAME diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3062e6a..3ac04b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - linux-musl - aarch64-linux # - aarch64-linux-musl - - aarch64-android + # - aarch64-android # - armv7-linux rust: [stable] include: @@ -74,42 +74,36 @@ jobs: - build: macos os: macos-latest target: x86_64-apple-darwin - binary_postfix: "" - build: macos-aarch64 os: macos-latest target: aarch64-apple-darwin - binary_postfix: "" - build: linux os: ubuntu-latest target: x86_64-unknown-linux-gnu - binary_postfix: "" - build: linux-musl os: ubuntu-latest target: x86_64-unknown-linux-musl - binary_postfix: "" - - build: aarch64-linux - os: ubuntu-latest - target: aarch64-unknown-linux-gnu - binary_postfix: "" + # TODO: make these work + # + # - build: aarch64-linux + # os: ubuntu-latest + # target: aarch64-unknown-linux-gnu # - build: aarch64-linux-musl # os: ubuntu-latest # target: aarch64-unknown-linux-musl - # binary_postfix: "" - - build: aarch64-android - os: ubuntu-latest - target: aarch64-linux-android - binary_postfix: "" + # - build: aarch64-android + # os: ubuntu-latest + # target: aarch64-linux-android # - build: armv7-linux # os: ubuntu-latest # target: armv7-unknown-linux-gnueabihf - # binary_postfix: "" env: RUST_BACKTRACE: full @@ -130,13 +124,13 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update --fix-missing - sudo apt-get install -y --no-install-recommends liblua5.1-0-dev libluajit-5.1-dev - - - if: matrix.os == 'ubuntu-latest' && contains(matrix.build, 'armv7') - run: sudo apt-get install -y --no-install-recommends gcc-arm-linux-gnueabihf libc-dev-armhf-cross + sudo apt-get install -y --no-install-recommends liblua5.1-0-dev libluajit-5.1-dev gcc musl-tools pkg-config - - if: matrix.os == 'ubuntu-latest' && contains(matrix.build, 'aarch64') - run: sudo apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu libc6-dev-arm64-cross + # - if: matrix.os == 'ubuntu-latest' && contains(matrix.build, 'armv7') + # run: sudo apt-get install -y --no-install-recommends gcc-arm-linux-gnueabihf libc-dev-armhf-cross + # + # - if: matrix.os == 'ubuntu-latest' && contains(matrix.build, 'aarch64') + # run: sudo apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu libc6-dev-arm64-cross - run: cargo build --target ${{ matrix.target }} - run: cargo test --target ${{ matrix.target }} diff --git a/docs/en/src/install.md b/docs/en/src/install.md index 40f449c..88d93f8 100644 --- a/docs/en/src/install.md +++ b/docs/en/src/install.md @@ -196,47 +196,6 @@ cargo build --locked --release --bin xplr sudo cp target/release/xplr /usr/local/bin/ ``` -## Android - -### [Termux][23] - -[![xplr-termuxfd3c398d3cf4bcbc.md.jpg][24]][25] - -> Please note that xplr isn't heavily tested on Termux, hence things might -> need a little tweaking and fixing for a smooth usage experience. - -- Install build dependencies - - ```bash - pkg install rustc cargo make - ``` - -- Install `xplr` - - ```bash - cargo install --locked --force xplr - ``` - -- Setup storage - - ```bash - termux-setup-storage - ``` - -- Setup config and runtime dir - - ```bash - export XDG_CONFIG_HOME="$PWD/storage/.config" - export XDG_RUNTIME_DIR="$PWD/storage/run" - - mkdir -p "$XDG_CONFIG_HOME" "$XDG_RUNTIME_DIR" - ``` - -- Run - ```bash - ~/.cargo/bin/xplr - ``` - [1]: #direct-download [2]: #from-cratesio [3]: #build-from-source @@ -259,8 +218,6 @@ sudo cp target/release/xplr /usr/local/bin/ [20]: https://gcc.gnu.org/ [21]: https://www.gnu.org/software/make/ [22]: https://git-scm.com/ -[23]: https://termux.com/ -[24]: https://s3.gifyu.com/images/xplr-termuxfd3c398d3cf4bcbc.md.jpg [25]: https://gifyu.com/image/tF2D [26]: https://github.com/sayanarijit/xplr/releases/latest/download/xplr-linux-musl.tar.gz [27]: https://pkgs.alpinelinux.org/packages?name=xplr