Skip to content

Commit e93dd42

Browse files
committed
fix: eliminate arm architecture from ci
1 parent fd09c4f commit e93dd42

File tree

2 files changed

+6
-77
lines changed

2 files changed

+6
-77
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
strategy:
9393
fail-fast: false
9494
matrix:
95-
rust: [nightly, stable, '1.65']
95+
rust: [nightly, stable, '1.70']
9696
continue-on-error: ${{ matrix.rust == 'nightly' }}
9797
steps:
9898
- uses: actions/checkout@master
@@ -110,58 +110,19 @@ jobs:
110110
sudo apt-get -qq install musl-tools
111111
- name: Build Debug
112112
run: |
113-
make build-linux-musl-debug
113+
cargo build --target=x86_64-unknown-linux-musl
114114
./target/x86_64-unknown-linux-musl/debug/leetui --version
115115
- name: Build Release
116116
run: |
117-
make build-linux-musl-release
117+
cargo build --release --target=x86_64-unknown-linux-musl
118118
./target/x86_64-unknown-linux-musl/release/leetui --version
119119
ls -l ./target/x86_64-unknown-linux-musl/release/leetui
120-
- name: Test
121-
run: |
122-
make test-linux-musl
120+
# - name: Test
121+
# run: |
122+
# make test-linux-musl
123123
- name: Test Install
124124
run: cargo install --path "." --force
125125

126-
build-linux-arm:
127-
runs-on: ubuntu-latest
128-
strategy:
129-
fail-fast: false
130-
matrix:
131-
rust: [nightly, stable, '1.70']
132-
continue-on-error: ${{ matrix.rust == 'nightly' }}
133-
steps:
134-
- uses: actions/checkout@master
135-
- name: Install Rust
136-
uses: actions-rs/toolchain@v1
137-
with:
138-
toolchain: ${{ matrix.rust }}
139-
profile: minimal
140-
default: true
141-
override: true
142-
- name: Setup ARM toolchain
143-
run: |
144-
rustup target add aarch64-unknown-linux-gnu
145-
rustup target add armv7-unknown-linux-gnueabihf
146-
rustup target add arm-unknown-linux-gnueabihf
147-
148-
curl -o $GITHUB_WORKSPACE/aarch64.tar.xz https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu.tar.xz
149-
curl -o $GITHUB_WORKSPACE/arm.tar.xz https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/8.2-2018.08/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf.tar.xz
150-
151-
tar xf $GITHUB_WORKSPACE/aarch64.tar.xz
152-
tar xf $GITHUB_WORKSPACE/arm.tar.xz
153-
154-
echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-aarch64-linux-gnu/bin" >> $GITHUB_PATH
155-
echo "$GITHUB_WORKSPACE/gcc-arm-8.2-2018.08-x86_64-arm-linux-gnueabihf/bin" >> $GITHUB_PATH
156-
157-
- name: Build Debug
158-
run: |
159-
make build-linux-arm-debug
160-
- name: Build Release
161-
run: |
162-
make build-linux-arm-release
163-
ls -l ./target/aarch64-unknown-linux-gnu/release/leetui || ls -l ./target/armv7-unknown-linux-gnueabihf/release/leetui || ls -l ./target/arm-unknown-linux-gnueabihf/release/leetui
164-
165126
linting:
166127
name: Lints
167128
runs-on: ubuntu-latest

Makefile

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)