]> git.lizzy.rs Git - rust.git/blobdiff - .github/workflows/clippy_bors.yml
Auto merge of #5453 - rabisg0:fix/redundant_clone, r=phansch
[rust.git] / .github / workflows / clippy_bors.yml
index cb2041e4990548f15f3864ccc2c2df510ca03a31..3b1774e03bcf2241da8e9338008a376f5a1cbdf0 100644 (file)
@@ -2,18 +2,14 @@ name: Clippy Test (bors)
 
 on:
   push:
-    branches: [auto, try]
-    # Don't run tests, when only textfiles were modified
-    paths-ignore:
-    - 'COPYRIGHT'
-    - 'LICENSE-*'
-    - '**.md'
-    - '**.txt'
+    branches:
+      - auto
+      - try
 
 env:
   RUST_BACKTRACE: 1
   CARGO_TARGET_DIR: '${{ github.workspace }}/target'
-  GHA_CI: 1
+  NO_FMT_TEST: 1
 
 jobs:
   changelog:
@@ -27,6 +23,8 @@ jobs:
       uses: actions/checkout@v2.0.0
       with:
         ref: ${{ github.ref }}
+
+    # Run
     - name: Check Changelog
       run: |
         MESSAGE=$(git log --format=%B -n 1)
@@ -41,6 +39,8 @@ jobs:
         elif [[ "$output" = "none" ]]; then
           echo "WARNING: changelog is 'none'"
         fi
+      env:
+        PYTHONIOENCODING: 'utf-8'
   base:
     needs: changelog
     strategy:
@@ -68,34 +68,46 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+    # Setup
     - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
       with:
         github_token: "${{ secrets.github_token }}"
+
     - 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/toolchain@v1.0.3
       with:
         toolchain: nightly
         target: ${{ matrix.host }}
         profile: minimal
+
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+
+    - name: Run cargo update
+      run: cargo update
+
     - name: Cache cargo dir
       uses: actions/cache@v1
       with:
         path: ~/.cargo
-        key: ${{ runner.os }}-${{ matrix.host }}
-    - name: Checkout
-      uses: actions/checkout@v2.0.0
+        key: ${{ runner.os }}-${{ matrix.host }}-${{ hashFiles('Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.host }}
+
     - name: Master Toolchain Setup
       run: bash setup-toolchain.sh
       env:
         HOST_TOOLCHAIN: ${{ matrix.host }}
       shell: bash
 
+    # Run
     - name: Set LD_LIBRARY_PATH (Linux)
       if: runner.os == 'Linux'
       run: |
@@ -113,68 +125,107 @@ jobs:
         $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
-        )
+      run: bash .github/driver.sh
       shell: bash
+      env:
+        OS: ${{ runner.os }}
 
+    # Cleanup
     - name: Run cargo-cache --autoclean
       run: |
-        cargo install cargo-cache --debug
-        /usr/bin/find ~/.cargo/bin ! -type d -exec strip {} \;
-        cargo cache --autoclean
+        cargo +nightly install cargo-cache --no-default-features --features ci-autoclean cargo-cache
+        cargo cache
       shell: bash
-  integration:
+  integration_build:
     needs: changelog
+    runs-on: ubuntu-latest
+
+    steps:
+    # Setup
+    - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
+      with:
+        github_token: "${{ secrets.github_token }}"
+
+    - name: rust-toolchain
+      uses: actions-rs/toolchain@v1.0.3
+      with:
+        toolchain: nightly
+        target: x86_64-unknown-linux-gnu
+        profile: minimal
+
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+
+    - name: Run cargo update
+      run: cargo update
+
+    - name: Cache cargo dir
+      uses: actions/cache@v1
+      with:
+        path: ~/.cargo
+        key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-x86_64-unknown-linux-gnu
+
+    - name: Master Toolchain Setup
+      run: bash setup-toolchain.sh
+
+    # Run
+    - name: Build Integration Test
+      run: cargo test --test integration --features integration --no-run
+
+    # Upload
+    - name: Extract Binaries
+      run: |
+        DIR=$CARGO_TARGET_DIR/debug
+        rm $DIR/deps/integration-*.d
+        mv $DIR/deps/integration-* $DIR/integration
+        find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf
+        rm -rf $CARGO_TARGET_DIR/release
+
+    - name: Upload Binaries
+      uses: actions/upload-artifact@v1
+      with:
+        name: target
+        path: target
+
+    # Cleanup
+    - name: Run cargo-cache --autoclean
+      run: |
+        cargo +nightly install cargo-cache --no-default-features --features ci-autoclean cargo-cache
+        cargo cache
+  integration:
+    needs: integration_build
     strategy:
       fail-fast: false
       max-parallel: 6
@@ -183,7 +234,8 @@ jobs:
         - 'rust-lang/cargo'
         - 'rust-lang/rls'
         - 'rust-lang/chalk'
-        - 'rust-lang/rustfmt'
+        # FIXME: Disabled until https://github.com/rust-lang/rust/issues/71077 is fixed
+        # - 'rust-lang/rustfmt'
         - 'Marwes/combine'
         - 'Geal/nom'
         - 'rust-lang/stdarch'
@@ -199,34 +251,80 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    # Setup
     - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
       with:
         github_token: "${{ secrets.github_token }}"
+
     - name: rust-toolchain
       uses: actions-rs/toolchain@v1.0.3
       with:
         toolchain: nightly
         target: x86_64-unknown-linux-gnu
         profile: minimal
+
+    - name: Checkout
+      uses: actions/checkout@v2.0.0
+
+    - name: Run cargo update
+      run: cargo update
+
     - name: Cache cargo dir
       uses: actions/cache@v1
       with:
         path: ~/.cargo
-        key: ${{ runner.os }}-x86_64-unknown-linux-gnu
-    - name: Checkout
-      uses: actions/checkout@v2.0.0
+        key: ${{ runner.os }}-x86_64-unknown-linux-gnu-${{ hashFiles('Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-x86_64-unknown-linux-gnu
+
     - name: Master Toolchain Setup
       run: bash setup-toolchain.sh
 
-    - name: Build
-      run: cargo build --features integration
+    # Download
+    - name: Download target dir
+      uses: actions/download-artifact@v1
+      with:
+        name: target
+        path: target
+
+    - name: Make Binaries Executable
+      run: chmod +x $CARGO_TARGET_DIR/debug/*
+
+    # Run
     - name: Test ${{ matrix.integration }}
-      run: cargo test --test integration --features integration
+      run: $CARGO_TARGET_DIR/debug/integration
       env:
         INTEGRATION: ${{ matrix.integration }}
+        RUSTUP_TOOLCHAIN: master
 
+    # Cleanup
     - name: Run cargo-cache --autoclean
       run: |
-        cargo install cargo-cache --debug
-        find ~/.cargo/bin ! -type d -exec strip {} \;
-        cargo cache --autoclean
+        cargo +nightly install cargo-cache --no-default-features --features ci-autoclean cargo-cache
+        cargo cache
+
+  # These jobs doesn't actually test anything, but they're only used to tell
+  # bors the build completed, as there is no practical way to detect when a
+  # workflow is successful listening to webhooks only.
+  #
+  # ALL THE PREVIOUS JOBS NEED TO BE ADDED TO THE `needs` SECTION OF THIS JOB!
+
+  end-success:
+    name: bors test finished
+    if: github.event.pusher.name == 'bors' && success()
+    runs-on: ubuntu-latest
+    needs: [base, integration]
+
+    steps:
+      - name: Mark the job as successful
+        run: exit 0
+
+  end-failure:
+    name: bors test finished
+    if: github.event.pusher.name == 'bors' && (failure() || cancelled())
+    runs-on: ubuntu-latest
+    needs: [base, integration]
+
+    steps:
+      - name: Mark the job as a failure
+        run: exit 1