]> git.lizzy.rs Git - rust.git/blobdiff - .github/workflows/clippy_bors.yml
Auto merge of #95436 - cjgillot:static-mut, r=oli-obk
[rust.git] / .github / workflows / clippy_bors.yml
index b1b207416a1ec90b60c7ea233d40ea147905fa8f..f571485e6d389befdf909d2f9ab5fa7bf25db69a 100644 (file)
@@ -2,12 +2,18 @@ name: Clippy Test (bors)
 
 on:
   push:
-    branches: [auto, try]
+    branches:
+      - auto
+      - try
 
 env:
   RUST_BACKTRACE: 1
   CARGO_TARGET_DIR: '${{ github.workspace }}/target'
-  GHA_CI: 1
+  NO_FMT_TEST: 1
+
+defaults:
+  run:
+    shell: bash
 
 jobs:
   changelog:
@@ -17,23 +23,27 @@ jobs:
     - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
       with:
         github_token: "${{ secrets.github_token }}"
+
     - name: Checkout
-      uses: actions/checkout@v2.0.0
+      uses: actions/checkout@v2.3.3
       with:
         ref: ${{ github.ref }}
+
+    # Run
     - name: Check Changelog
       run: |
         MESSAGE=$(git log --format=%B -n 1)
         PR=$(echo "$MESSAGE" | grep -o "#[0-9]*" | head -1 | sed -e 's/^#//')
-        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
+        body=$(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'])")
+        output=$(grep "^changelog:\s*\S" <<< "$body" | sed "s/changelog:\s*//g") || {
           echo "ERROR: PR body must contain 'changelog: ...'"
           exit 1
-        elif [[ "$output" = "none" ]]; then
+        }
+        if [[ "$output" = "none" ]]; then
           echo "WARNING: changelog is 'none'"
+        else
+          echo "changelog: $output"
         fi
       env:
         PYTHONIOENCODING: 'utf-8'
@@ -63,44 +73,32 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
+    # NOTE: If you modify this job, make sure you copy the changes to clippy.yml
     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 }}-${{ 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
+      uses: actions/checkout@v2.3.3
 
+    - name: Install toolchain
+      run: rustup show active-toolchain
+
+    # Run
     - 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}}"
+        echo "LD_LIBRARY_PATH=${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV
     - name: Link rustc dylib (MacOS)
       if: runner.os == 'macOS'
       run: |
@@ -110,89 +108,76 @@ jobs:
     - name: Set PATH (Windows)
       if: runner.os == 'Windows'
       run: |
-        $sysroot = rustc --print sysroot
-        $env:PATH += ';' + $sysroot + '\bin'
-        echo "::set-env name=PATH::$env:PATH"
+        SYSROOT=$(rustc --print sysroot)
+        echo "$SYSROOT/bin" >> $GITHUB_PATH
+
     - name: Build
-      run: cargo build --features deny-warnings
-      shell: bash
+      run: cargo build --features deny-warnings,internal
+
     - name: Test
-      run: cargo test --features deny-warnings
-      shell: bash
+      if: runner.os == 'Linux'
+      run: cargo test --features deny-warnings,internal
+
+    - name: Test
+      if: runner.os != 'Linux'
+      run: cargo test --features deny-warnings,internal -- --skip dogfood
+
     - name: Test clippy_lints
-      run: cargo test --features deny-warnings
-      shell: bash
+      run: cargo test --features deny-warnings,internal
       working-directory: clippy_lints
+
+    - name: Test clippy_utils
+      run: cargo test --features deny-warnings,internal
+      working-directory: clippy_utils
+
     - 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: bash .github/driver.sh
-      shell: bash
       env:
         OS: ${{ runner.os }}
 
-    - 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_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
+      uses: actions/checkout@v2.3.3
+
+    - name: Install toolchain
+      run: rustup show active-toolchain
 
+    # 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
-        mv $DIR/integration-* $DIR/integration
+        rm -rf $CARGO_TARGET_DIR/release
+
     - name: Upload Binaries
       uses: actions/upload-artifact@v1
       with:
         name: target
         path: target
 
-    - name: Run cargo-cache --autoclean
-      run: |
-        cargo install cargo-cache --debug
-        find ~/.cargo/bin ! -type d -exec strip {} \;
-        cargo cache --autoclean
   integration:
     needs: integration_build
     strategy:
@@ -201,14 +186,16 @@ jobs:
       matrix:
         integration:
         - 'rust-lang/cargo'
-        - 'rust-lang/rls'
+        # FIXME: re-enable once fmt_macros is renamed in RLS
+        # - 'rust-lang/rls'
         - 'rust-lang/chalk'
         - 'rust-lang/rustfmt'
         - 'Marwes/combine'
         - 'Geal/nom'
         - 'rust-lang/stdarch'
         - 'serde-rs/serde'
-        - 'chronotope/chrono'
+        # FIXME: chrono currently cannot be compiled with `--all-targets`
+        # - 'chronotope/chrono'
         - 'hyperium/hyper'
         - 'rust-random/rand'
         - 'rust-lang/futures-rs'
@@ -219,47 +206,34 @@ 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-${{ hashFiles('Cargo.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-x86_64-unknown-linux-gnu
-    - name: Master Toolchain Setup
-      run: bash setup-toolchain.sh
+      uses: actions/checkout@v2.3.3
 
+    - name: Install toolchain
+      run: rustup show active-toolchain
+
+    # 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_TARGET_DIR/debug/integration
+      run: |
+        RUSTUP_TOOLCHAIN="$(rustup show active-toolchain | grep -o -E "nightly-[0-9]{4}-[0-9]{2}-[0-9]{2}")" \
+          $CARGO_TARGET_DIR/debug/integration
       env:
         INTEGRATION: ${{ matrix.integration }}
-        RUSTUP_TOOLCHAIN: master
-
-    - name: Run cargo-cache --autoclean
-      run: |
-        cargo install cargo-cache --debug
-        find ~/.cargo/bin ! -type d -exec strip {} \;
-        cargo cache --autoclean
 
   # 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
@@ -271,7 +245,7 @@ jobs:
     name: bors test finished
     if: github.event.pusher.name == 'bors' && success()
     runs-on: ubuntu-latest
-    needs: [base, integration]
+    needs: [changelog, base, integration_build, integration]
 
     steps:
       - name: Mark the job as successful
@@ -281,7 +255,7 @@ jobs:
     name: bors test finished
     if: github.event.pusher.name == 'bors' && (failure() || cancelled())
     runs-on: ubuntu-latest
-    needs: [base, integration]
+    needs: [changelog, base, integration_build, integration]
 
     steps:
       - name: Mark the job as a failure