Skip to content

Commit

Permalink
Auto merge of #5071 - flip1995:gha, r=<try>
Browse files Browse the repository at this point in the history
[WIP][DNM] Switch to GitHub Actions

cc #4577

This is just an experiment. I don't think we have a consensus _if_ we should move away from travis/appveyor.

GHA would let us run up to 20 concurrent jobs. Since we have 15 integration tests and 4 (linux, linux 32-bit, macos, windows) basic tests, we would be able to run everything concurrently. ~~Also IIUC we only have to build Clippy once for every initegration test and then only check the repos.~~ Nope, dependent jobs exist, but they won't keep the artifacts (not even the checkout).

TODO before merge:

- [ ] Add `DEPLOY_KEY` secret to github repo
- [ ] test deployment on test branch `gh-test`
- [ ] talk with `@rust-lang/infra` for bors
- [ ] Add back travis + appveyor files for transition period (?)

changelog: none
  • Loading branch information
bors committed Jan 23, 2020
2 parents eff3bc5 + 1f66f67 commit be991e3
Show file tree
Hide file tree
Showing 24 changed files with 706 additions and 506 deletions.
81 changes: 0 additions & 81 deletions .github/deploy.sh

This file was deleted.

Binary file removed .github/deploy_key.enc
Binary file not shown.
98 changes: 98 additions & 0 deletions .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
name: Clippy Test

on:
push:
# Ignore bors branches, since they are covered by `clippy_bors.yml`
branches-ignore: [auto, try]
# Don't run Clippy tests, when only textfiles were modified
paths-ignore:
- 'COPYRIGHT'
- 'LICENSE-*'
- '**.md'
- '**.txt'
pull_request:
# Don't run Clippy tests, when only textfiles were modified
paths-ignore:
- 'COPYRIGHT'
- 'LICENSE-*'
- '**.md'
- '**.txt'

env:
RUST_BACKTRACE: 1
CARGO_TARGET_DIR: '${{ github.workspace }}/target'
GHA_CI: 1

jobs:
base:
runs-on: ubuntu-latest

steps:
- name: rust-toolchain
uses: actions-rs/[email protected]
with:
toolchain: nightly
target: x86_64-unknown-linux-gnu
profile: minimal
- name: Cache cargo dir
uses: actions/cache@v1
with:
path: ~/.cargo
key: ${{ runner.os }}-x86_64-unknown-linux-gnu
- name: Checkout
uses: actions/[email protected]
- name: Master Toolchain Setup
run: bash setup-toolchain.sh

- name: Set LD_LIBRARY_PATH (Linux)
run: |
SYSROOT=$(rustc --print sysroot)
echo "::set-env name=LD_LIBRARY_PATH::${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
- name: Build
run: cargo build --features deny-warnings
- name: Test
run: cargo test --features deny-warnings
- name: Test clippy_lints
run: cargo test --features deny-warnings
working-directory: clippy_lints
- name: Test rustc_tools_util
run: cargo test --features deny-warnings
working-directory: rustc_tools_util
- name: Test clippy_dev
run: cargo test --features deny-warnings
working-directory: clippy_dev
- name: Test cargo-clippy
run: ../target/debug/cargo-clippy
working-directory: clippy_workspace_tests
- name: Test clippy-driver
run: |
(
set -ex
# Check sysroot handling
sysroot=$(./target/debug/clippy-driver --print sysroot)
test "$sysroot" = "$(rustc --print sysroot)"
desired_sysroot=/tmp
sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
test "$sysroot" = $desired_sysroot
sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
test "$sysroot" = $desired_sysroot
# Make sure this isn't set - clippy-driver should cope without it
unset CARGO_MANIFEST_DIR
# Run a lint and make sure it produces the expected output. It's also expected to exit with code 1
# FIXME: How to match the clippy invocation in compile-test.rs?
./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/cstring.rs 2> cstring.stderr && exit 1
sed -e 's,tests/ui,$DIR,' -e '/= help/d' cstring.stderr > normalized.stderr
diff normalized.stderr tests/ui/cstring.stderr
# TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR
)
- name: Run cargo-cache --autoclean
run: |
cargo install cargo-cache --debug
find ~/.cargo/bin ! -type d -exec strip {} \;
cargo cache --autoclean
217 changes: 217 additions & 0 deletions .github/workflows/clippy_bors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
name: Clippy Test (bors)

on:
push:
branches: [auto, try]
# Don't run tests, when only textfiles were modified
paths-ignore:
- 'COPYRIGHT'
- 'LICENSE-*'
- '**.md'
- '**.txt'

env:
RUST_BACKTRACE: 1
CARGO_TARGET_DIR: '${{ github.workspace }}/target'
GHA_CI: 1

jobs:
changelog:
runs-on: ubuntu-latest

steps:
- name: Check Changelog
run: |
PR=$(echo "${{ github.ref }}" | grep -o "[0-9]*")
output=$(curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -s "https://api.github.com/repos/rust-lang/rust-clippy/pulls/$PR" | \
python -c "import sys, json; print(json.load(sys.stdin)['body'])" | \
grep "^changelog: " | \
sed "s/changelog: //g")
if [[ -z "$output" ]]; then
echo "ERROR: PR body must contain 'changelog: ...'"
exit 1
elif [[ "$output" = "none" ]]; then
echo "WARNING: changelog is 'none'"
fi
base:
needs: changelog
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
host: [x86_64-unknown-linux-gnu, i686-unknown-linux-gnu, x86_64-apple-darwin, x86_64-pc-windows-msvc]
exclude:
- os: ubuntu-latest
host: x86_64-apple-darwin
- os: ubuntu-latest
host: x86_64-pc-windows-msvc
- os: macos-latest
host: x86_64-unknown-linux-gnu
- os: macos-latest
host: i686-unknown-linux-gnu
- os: macos-latest
host: x86_64-pc-windows-msvc
- os: windows-latest
host: x86_64-unknown-linux-gnu
- os: windows-latest
host: i686-unknown-linux-gnu
- os: windows-latest
host: x86_64-apple-darwin

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

steps:
- name: Install dependencies (Linux-i686)
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install gcc-multilib libssl-dev:i386 libgit2-dev:i386
if: matrix.host == 'i686-unknown-linux-gnu'
- name: rust-toolchain
uses: actions-rs/[email protected]
with:
toolchain: nightly
target: ${{ matrix.host }}
profile: minimal
- name: Cache cargo dir
uses: actions/cache@v1
with:
path: ~/.cargo
key: ${{ runner.os }}-${{ matrix.host }}
- name: Checkout
uses: actions/[email protected]
- name: Master Toolchain Setup
run: bash setup-toolchain.sh
env:
HOST_TOOLCHAIN: ${{ matrix.host }}
shell: bash

- name: Set LD_LIBRARY_PATH (Linux)
if: runner.os == 'Linux'
run: |
SYSROOT=$(rustc --print sysroot)
echo "::set-env name=LD_LIBRARY_PATH::${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
- name: Link rustc dylib (MacOS)
if: runner.os == 'macOS'
run: |
SYSROOT=$(rustc --print sysroot)
sudo mkdir -p /usr/local/lib
sudo find "${SYSROOT}/lib" -maxdepth 1 -name '*dylib' -exec ln -s {} /usr/local/lib \;
- name: Set PATH (Windows)
if: runner.os == 'Windows'
run: |
$sysroot = rustc --print sysroot
$env:PATH += ';' + $sysroot + '\bin'
echo "::set-env name=PATH::$env:PATH"
- name: Build
run: cargo build --features deny-warnings
shell: bash
- name: Test
run: cargo test --features deny-warnings
shell: bash
- name: Test clippy_lints
run: cargo test --features deny-warnings
shell: bash
working-directory: clippy_lints
- name: Test rustc_tools_util
run: cargo test --features deny-warnings
shell: bash
working-directory: rustc_tools_util
- name: Test clippy_dev
run: cargo test --features deny-warnings
shell: bash
working-directory: clippy_dev
- name: Test cargo-clippy
run: ../target/debug/cargo-clippy
shell: bash
working-directory: clippy_workspace_tests
- name: Test clippy-driver
run: |
(
set -ex
# Check sysroot handling
sysroot=$(./target/debug/clippy-driver --print sysroot)
test "$sysroot" = "$(rustc --print sysroot)"
if [[ ${{ runner.os }} == "Windows" ]]; then
desired_sysroot=C:/tmp
else
desired_sysroot=/tmp
fi
sysroot=$(./target/debug/clippy-driver --sysroot $desired_sysroot --print sysroot)
test "$sysroot" = $desired_sysroot
sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
test "$sysroot" = $desired_sysroot
# Make sure this isn't set - clippy-driver should cope without it
unset CARGO_MANIFEST_DIR
# Run a lint and make sure it produces the expected output. It's also expected to exit with code 1
# FIXME: How to match the clippy invocation in compile-test.rs?
./target/debug/clippy-driver -Dwarnings -Aunused -Zui-testing --emit metadata --crate-type bin tests/ui/cstring.rs 2> cstring.stderr && exit 1
sed -e 's,tests/ui,$DIR,' -e '/= help/d' cstring.stderr > normalized.stderr
diff normalized.stderr tests/ui/cstring.stderr
# TODO: CLIPPY_CONF_DIR / CARGO_MANIFEST_DIR
)
shell: bash

- name: Run cargo-cache --autoclean
run: |
cargo install cargo-cache --debug
/usr/bin/find ~/.cargo/bin ! -type d -exec strip {} \;
cargo cache --autoclean
shell: bash
integration:
needs: changelog
strategy:
fail-fast: false
matrix:
integration:
- 'rust-lang/rls'
- 'rust-lang/cargo'
- 'rust-lang/chalk'
- 'Geal/nom'
- 'rust-lang/rustfmt'
- 'hyperium/hyper'
- 'rust-itertools/itertools'
- 'serde-rs/serde'
- 'rust-lang/stdarch'
- 'rust-random/rand'
- 'rust-lang/futures-rs'
- 'Marwes/combine'
- 'rust-lang-nursery/failure'
- 'rust-lang/log'
- 'chronotope/chrono'

runs-on: ubuntu-latest

steps:
- name: rust-toolchain
uses: actions-rs/[email protected]
with:
toolchain: nightly
target: x86_64-unknown-linux-gnu
profile: minimal
- name: Cache cargo dir
uses: actions/cache@v1
with:
path: ~/.cargo
key: ${{ runner.os }}-x86_64-unknown-linux-gnu
- name: Checkout
uses: actions/[email protected]
- name: Master Toolchain Setup
run: bash setup-toolchain.sh

- name: Build
run: cargo build --features integration
- name: Test ${{ matrix.integration }}
run: cargo test --test integration --features integration
env:
INTEGRATION: ${{ matrix.integration }}

- name: Run cargo-cache --autoclean
run: |
cargo install cargo-cache --debug
find ~/.cargo/bin ! -type d -exec strip {} \;
cargo cache --autoclean
Loading

0 comments on commit be991e3

Please sign in to comment.