Skip to content

Commit

Permalink
ci: Use setup-cross-toolchain-action for android
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Jul 28, 2023
1 parent 37c9bab commit 885adf8
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 30 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ jobs:

test:
needs: tidy
env:
cargo: cargo
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -224,11 +222,7 @@ jobs:
- uses: taiki-e/setup-cross-toolchain-action@v1
with:
target: ${{ matrix.target }}
if: matrix.target != '' && !contains(matrix.target, '-android')
- uses: taiki-e/install-action@cross
if: contains(matrix.target, '-android')
- run: echo "cargo=cross" >>"${GITHUB_ENV}"
if: contains(matrix.target, '-android')
if: matrix.target != ''
- run: echo "RUSTFLAGS=${RUSTFLAGS} --cfg qemu" >>"${GITHUB_ENV}"
if: matrix.target != '' && !startsWith(matrix.target, 'i686') && !startsWith(matrix.target, 'x86_64')
- run: |
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "Apache-2.0 OR MIT"
repository = "https://github.com/taiki-e/portable-atomic"
keywords = ["atomic"]
categories = ["concurrency", "embedded", "hardware-support", "no-std", "no-std::no-alloc"]
exclude = ["/.*", "/tools", "/target-specs", "/Cross.toml", "/DEVELOPMENT.md"]
exclude = ["/.*", "/tools", "/target-specs", "/DEVELOPMENT.md"]
description = """
Portable atomic types including support for 128-bit atomics, atomic float, etc.
"""
Expand Down
22 changes: 0 additions & 22 deletions Cross.toml

This file was deleted.

0 comments on commit 885adf8

Please sign in to comment.