Skip to content

Commit

Permalink
Wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@briansmith
briansmith committed Jun 21, 2024
1 parent 1b8f998 commit 8856f93
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 362 deletions.
361 changes: 0 additions & 361 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,30 +163,6 @@ jobs:
features:
- # Default

target:
- aarch64-apple-darwin
- aarch64-apple-ios
# - aarch64-apple-tvos Tier 3; handled below
# - aarch64-apple-visionos Tier 3; handled below
# - aarch64-apple-watchos Tier 3; handled below
- aarch64-linux-android
- aarch64-pc-windows-msvc
- aarch64-unknown-linux-gnu
- aarch64-unknown-linux-musl
- arm-unknown-linux-gnueabi
- armv7-linux-androideabi
- armv7-unknown-linux-musleabihf
- i686-pc-windows-msvc
- i686-unknown-linux-gnu
- i686-unknown-linux-musl
- riscv64gc-unknown-linux-gnu
- wasm32-wasi
- x86_64-pc-windows-gnu
- x86_64-pc-windows-msvc
- x86_64-apple-darwin
- x86_64-unknown-linux-musl
- x86_64-unknown-linux-gnu

mode:
- # debug
- --release
Expand Down Expand Up @@ -362,340 +338,3 @@ jobs:
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.63.0') &&
!contains(matrix.host_os, 'windows') }}
run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}

test-bench:
# Don't run duplicate `push` jobs for the repo owner's PRs.
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

runs-on: ubuntu-22.04

steps:
- run: sudo apt-get update -y

- uses: briansmith/actions-checkout@v4
with:
persist-credentials: false

- run: mk/install-build-tools.sh +stable --target=x86_64-unknown-linux-gnu
shell: sh

- run: rustup --version

- run: cargo test -p ring-bench --all-features --all-targets

test-doc:
# Don't run duplicate `push` jobs for the repo owner's PRs.
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

runs-on: ubuntu-22.04

strategy:
matrix:
rust_channel:
- stable
- nightly

steps:
- run: sudo apt-get update -y

- run: rustup toolchain add --profile=minimal ${{ matrix.rust_channel }}

- uses: briansmith/actions-checkout@v4
with:
persist-credentials: false

- run: |
cargo +${{ matrix.rust_channel }} test -vv --doc --all-features
# XXX: GitHub Actions won't let us test all the combinations of features in
# the "test" matrix because the resultant matrix would be larger than the
# maximum they allow.
test-features:
# Don't run duplicate `push` jobs for the repo owner's PRs.
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

runs-on: ${{ matrix.host_os }}

env:
CC_ENABLE_DEBUG_OUTPUT: 1

strategy:
matrix:
features:
- --no-default-features
- --features=std,slow_tests

target:
- aarch64-unknown-linux-musl
- i686-pc-windows-msvc
- x86_64-unknown-linux-gnu

mode:
- --release

rust_channel:
- stable
- nightly
# Keep in sync with Cargo.toml and similar `rust_channel` sections.
- 1.63.0 # MSRV

include:
- target: aarch64-unknown-linux-musl
host_os: ubuntu-22.04

- target: i686-pc-windows-msvc
host_os: windows-latest

- target: x86_64-unknown-linux-gnu
host_os: ubuntu-22.04

steps:
- if: ${{ contains(matrix.host_os, 'ubuntu') }}
run: sudo apt-get update -y

- uses: briansmith/actions-checkout@v4
with:
persist-credentials: false

- run: mk/install-build-tools.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
shell: sh

- if: ${{ contains(matrix.host_os, 'windows') }}
run: ./mk/install-build-tools.ps1

- if: ${{ matrix.target == 'aarch64-pc-windows-msvc' }}
run: |
echo "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\x64\bin" >> $GITHUB_PATH
shell: bash

- if: ${{ !contains(matrix.host_os, 'windows') }}
run: |
mk/cargo.sh +${{ matrix.rust_channel }} test -vv --target=${{ matrix.target }} ${{ matrix.cargo_options }} ${{ matrix.features }} ${{ matrix.mode }}
- if: ${{ contains(matrix.host_os, 'windows') }}
run: |
cargo +${{ matrix.rust_channel }} test -vv --target=${{ matrix.target }} ${{ matrix.cargo_options }} ${{ matrix.features }} ${{ matrix.mode }}
# --all-targets doesn't run doctests: https://github.com/rust-lang/cargo/issues/6669
# Run doctests only on x86_64 to avoid cross-compilation hassles with `--no-run`.
- if: ${{ !contains(matrix.host_os, 'windows') && contains(matrix.target, 'x86_64') }}
run: |
mk/cargo.sh +${{ matrix.rust_channel }} test -vv --doc --target=${{ matrix.target }} ${{ matrix.cargo_options }} ${{ matrix.features }} ${{ matrix.mode }}
# Check that all the needed symbol renaming was done.
# TODO: Do this check on Windows too.

- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.63.0') &&
!contains(matrix.host_os, 'windows') }}
run: rustup toolchain install --component=llvm-tools-preview ${{ matrix.rust_channel }}

- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.63.0') &&
!contains(matrix.host_os, 'windows') }}
run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}

# The wasm32-unknown-unknown targets have a different set of feature sets and
# an additional `webdriver` dimension.
test-wasm32-browser:
# Don't run duplicate `push` jobs for the repo owner's PRs.
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

runs-on: ${{ matrix.host_os }}

env:
CC_ENABLE_DEBUG_OUTPUT: 1

strategy:
matrix:
features:
- --features=wasm32_unknown_unknown_js
- --no-default-features --features=wasm32_unknown_unknown_js

host_os:
- ubuntu-22.04
mode:
- # debug
- --release
rust_channel:
- stable
- beta
- nightly
target:
- wasm32-unknown-unknown
webdriver:
# TODO: Firefox is not in Ubuntu 22.04 images according to
# https://github.com/actions/runner-images/issues/5490 and our
# testing.
# - GECKODRIVER=$GECKOWEBDRIVER/geckodriver
- CHROMEDRIVER=$CHROMEWEBDRIVER/chromedriver

steps:
- if: ${{ contains(matrix.host_os, 'ubuntu') }}
run: sudo apt-get update -y

- uses: briansmith/actions-checkout@v4
with:
persist-credentials: false

- run: mk/install-build-tools.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
shell: sh

- if: ${{ contains(matrix.host_os, 'windows') }}
run: ./mk/install-build-tools.ps1

- run: cargo +${{ matrix.rust_channel }} generate-lockfile

- run: |
${{ matrix.webdriver }} mk/cargo.sh +${{ matrix.rust_channel }} test -vv --target=${{ matrix.target }} ${{ matrix.features }} ${{ matrix.mode }}
# Check that all the needed symbol renaming was done.
# TODO: Do this check on Windows too.
- run: rustup toolchain install --component=llvm-tools-preview ${{ matrix.rust_channel }}
- run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}

coverage:
# Don't run duplicate `push` jobs for the repo owner's PRs.
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

runs-on: ${{ matrix.host_os }}

env:
CC_ENABLE_DEBUG_OUTPUT: 1

strategy:
fail-fast: false
matrix:
features:
# Enable all the library features so we can measure all the coverage.
# Don't enable `slow_tests` and other (test suite) features that are
# unuseful, or even counterproductive, for coverage testing.
# `slow_tests` is slow and it is running code that is already intended
# to be covered without it being enabled.
- --features=std

# TODO: targets
target:
- aarch64-apple-darwin # Has assembly
- aarch64-unknown-linux-gnu # Has assembly
- arm-unknown-linux-gnueabi # Has assembly
- armv7-unknown-linux-gnueabihf # Has assembly
# - i686-unknown-linux-gnu # Has assembly; handled specially below.
- powerpc-unknown-linux-gnu # No assembly 32-bit big-endian with flags
- powerpc64-unknown-linux-gnu # No assembly 64-bit big-endian with flags
- powerpc64le-unknown-linux-gnu # No assembly 64-bit little-endian with flags
- riscv64gc-unknown-linux-gnu # No assembly 64-bit little-endian without flags
- s390x-unknown-linux-gnu # No assembly 64-bit big-endian
- x86_64-apple-darwin # Has assembly
- x86_64-unknown-linux-musl # Has assembly

mode:
- # debug

# Coverage collection is Nightly-only
rust_channel:
- nightly

# TODO: targets
include:
- target: aarch64-apple-darwin
host_os: macos-14

# TODO: Use the -musl target after
# https://github.com/rust-lang/rust/issues/79556 and
# https://github.com/rust-lang/rust/issues/79555 are fixed.
- target: aarch64-unknown-linux-gnu
host_os: ubuntu-22.04

- features: --features=unstable-testing-arm-no-hw,std
target: aarch64-unknown-linux-gnu
mode: # debug
rust_channel: nightly
host_os: ubuntu-22.04

- target: arm-unknown-linux-gnueabi
host_os: ubuntu-22.04

- target: armv7-unknown-linux-gnueabihf
host_os: ubuntu-22.04

- features: --features=unstable-testing-arm-no-neon,std
target: armv7-unknown-linux-gnueabihf
mode: # debug
rust_channel: nightly
host_os: ubuntu-22.04

# TODO: Use the -musl target after
# https://github.com/rust-lang/rust/issues/79556 and
# https://github.com/rust-lang/rust/issues/79555 are fixed.
- target: i686-unknown-linux-gnu
cpu_model: # default
features: --features=std
mode: # debug
rust_channel: nightly
host_os: ubuntu-22.04

- target: i686-unknown-linux-gnu
cpu_model: Conroe-v1
features: --features=std
mode: # debug
rust_channel: nightly
host_os: ubuntu-22.04

- target: powerpc-unknown-linux-gnu
host_os: ubuntu-22.04

- target: powerpc64-unknown-linux-gnu
host_os: ubuntu-22.04

- target: powerpc64le-unknown-linux-gnu
host_os: ubuntu-22.04

- target: riscv64gc-unknown-linux-gnu
host_os: ubuntu-22.04

- target: s390x-unknown-linux-gnu
host_os: ubuntu-22.04

- target: x86_64-apple-darwin
host_os: macos-13

- target: x86_64-unknown-linux-gnu
cpu_model: Conroe-v1
features: --features=std
mode: # debug
rust_channel: nightly
host_os: ubuntu-22.04

- target: x86_64-unknown-linux-gnu
cpu_model: Denverton-v2
features: --features=std
mode: # debug
rust_channel: nightly
host_os: ubuntu-22.04

- target: x86_64-unknown-linux-musl
host_os: ubuntu-22.04

steps:
- if: ${{ contains(matrix.host_os, 'ubuntu') }}
run: sudo apt-get update -y

- uses: briansmith/actions-checkout@v4
with:
persist-credentials: false

- run: RING_CPU_MODEL=${{ matrix.cpu_model }} RING_COVERAGE=1 mk/install-build-tools.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
shell: sh

- if: ${{ contains(matrix.host_os, 'windows') }}
run: ./mk/install-build-tools.ps1

- if: ${{ !contains(matrix.host_os, 'windows') }}
run: |
RING_CPU_MODEL=${{ matrix.cpu_model }} RING_COVERAGE=1 mk/cargo.sh +${{ matrix.rust_channel }} test -vv --target=${{ matrix.target }} ${{ matrix.cargo_options }} ${{ matrix.features }} ${{ matrix.mode }}
- uses: briansmith/codecov-codecov-action@v4
with:
directory: ./target/${{ matrix.target }}/debug/coverage/reports
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true
2 changes: 1 addition & 1 deletion mk/check-symbol-prefixes.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ nm_exe="${llvm_root}/llvm-nm"
# Rust-compiler-generated symbols.
find target/$target -type f -name libring-*.rlib | while read -r infile; do
bad=$($nm_exe --defined-only --extern-only --print-file-name "$infile" \
| ( grep -v -E " . _?(__imp__ZN4ring|ring_core_|__rustc|_ZN|DW.ref.rust_eh_personality)" || [[ $? == 1 ]] ))
| ( grep -v -E " . _?(__imp__ZN4ring|__rustc|_ZN|DW.ref.rust_eh_personality)" || [[ $? == 1 ]] ))
if [ ! -z "${bad-}" ]; then
echo "$bad"
exit 1
Expand Down

0 comments on commit 8856f93

Please sign in to comment.