Merge branch 'master' into basic-test-explorer

Author: ShuiRuTian

.github/workflows/autopublish.yaml

@@ -28,7 +28,7 @@ jobs:
       - name: Publish Crates
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-          PATCH: ${{ github.run_number }}
+          RUN_NUMBER: ${{ github.run_number }}
         shell: bash
         run: |
           git config --global user.email "[email protected]"
@@ -49,8 +49,8 @@ jobs:
           cargo workspaces rename --from project-model project_model
           cargo workspaces rename --from test-utils test_utils
           cargo workspaces rename --from text-edit text_edit
-          cargo workspaces rename ra_ap_%n
           # Remove library crates from the workspaces so we don't auto-publish them as well
           sed -i 's/ "lib\/\*",//' ./Cargo.toml
+          cargo workspaces rename ra_ap_%n
           find crates/rust-analyzer -type f -name '*.rs' -exec sed -i 's/rust_analyzer/ra_ap_rust_analyzer/g' {} +
-          cargo workspaces publish --yes --force '*' --exact --no-git-commit --allow-dirty --skip-published custom 0.0.$PATCH
+          cargo workspaces publish --yes --force '*' --exact --no-git-commit --allow-dirty --skip-published custom 0.0.$(($RUN_NUMBER + 133))

.github/workflows/ci.yaml

@@ -24,6 +24,7 @@ jobs:
       pull-requests: read
     outputs:
       typescript: ${{ steps.filter.outputs.typescript }}
+      proc_macros: ${{ steps.filter.outputs.proc_macros }}
     steps:
       - uses: actions/checkout@v3
       - uses: dorny/paths-filter@4067d885736b84de7c414f582ac45897079b0a78
@@ -45,8 +46,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       CC: deny_c
-      RUST_CHANNEL: "${{ needs.changes.outputs.proc_macros == 'true' && 'nightly' || 'stable'}}"
-      USE_SYSROOT_ABI: "${{ needs.changes.outputs.proc_macros == 'true' && '--features sysroot-abi' || ''}}"
+      RUST_CHANNEL: "${{ needs.changes.outputs.proc_macros == 'true' && 'nightly' || 'stable' }}"
+      USE_SYSROOT_ABI: "${{ needs.changes.outputs.proc_macros == 'true' && '--features sysroot-abi' || '' }}"
 
     strategy:
       fail-fast: false
@@ -62,7 +63,8 @@ jobs:
       - name: Install Rust toolchain
         run: |
           rustup update --no-self-update ${{ env.RUST_CHANNEL }}
-          rustup component add rustfmt rust-src
+          rustup component add --toolchain ${{ env.RUST_CHANNEL }} rustfmt rust-src
+          rustup default ${{ env.RUST_CHANNEL }}
 
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@988c164c3d0e93c4dbab36aaf5bbeb77425b2894

.github/workflows/metrics.yaml

@@ -11,20 +11,135 @@ env:
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
-  metrics:
+  setup_cargo:
     if: github.repository == 'rust-lang/rust-analyzer'
     runs-on: ubuntu-latest
+    steps:
+      - name: Install Rust toolchain
+        run: |
+          rustup update --no-self-update stable
+          rustup component add rustfmt rust-src
+      - name: Cache cargo
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+          key: ${{ runner.os }}-cargo-${{ github.sha }}
+
+  build_metrics:
+    runs-on: ubuntu-latest
+    needs: setup_cargo
 
     steps:
     - name: Checkout repository
       uses: actions/checkout@v3
 
-    - name: Install Rust toolchain
-      run: |
-        rustup update --no-self-update stable
-        rustup component add rustfmt rust-src
+    - name: Restore cargo cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+        key: ${{ runner.os }}-cargo-${{ github.sha }}
+
+
+    - name: Collect build metrics
+      run: cargo xtask metrics build
+
+    - name: Cache target
+      uses: actions/cache@v3
+      with:
+        path: target/
+        key: ${{ runner.os }}-target-${{ github.sha }}
+
+    - name: Upload build metrics
+      uses: actions/upload-artifact@v3
+      with:
+        name: build-${{ github.sha }}
+        path: target/build.json
+        if-no-files-found: error
+
+  other_metrics:
+    strategy:
+      matrix:
+        names: [self, ripgrep, webrender, diesel]
+    runs-on: ubuntu-latest
+    needs: [setup_cargo, build_metrics]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Restore cargo cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+        key: ${{ runner.os }}-cargo-${{ github.sha }}
+
+    - name: Restore target cache
+      uses: actions/cache@v3
+      with:
+        path: target/
+        key: ${{ runner.os }}-target-${{ github.sha }}
 
     - name: Collect metrics
-      run: cargo xtask metrics
-      env:
-        METRICS_TOKEN: ${{ secrets.METRICS_TOKEN }}
+      run: cargo xtask metrics ${{ matrix.names }}
+
+    - name: Upload metrics
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.names }}-${{ github.sha }}
+        path: target/${{ matrix.names }}.json
+        if-no-files-found: error
+
+  generate_final_metrics:
+    runs-on: ubuntu-latest
+    needs: [build_metrics, other_metrics]
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Download build metrics
+      uses: actions/download-artifact@v3
+      with:
+        name: build-${{ github.sha }}
+
+    - name: Download self metrics
+      uses: actions/download-artifact@v3
+      with:
+        name: self-${{ github.sha }}
+
+    - name: Download ripgrep metrics
+      uses: actions/download-artifact@v3
+      with:
+        name: ripgrep-${{ github.sha }}
+
+    - name: Download webrender metrics
+      uses: actions/download-artifact@v3
+      with:
+        name: webrender-${{ github.sha }}
+
+    - name: Download diesel metrics
+      uses: actions/download-artifact@v3
+      with:
+        name: diesel-${{ github.sha }}
+
+    - name: Combine json
+      run: |
+        git clone --depth 1 https://[email protected]/rust-analyzer/metrics.git
+        jq -s ".[0] * .[1] * .[2] * .[3] * .[4]" build.json self.json ripgrep.json webrender.json diesel.json -c >> metrics/metrics.json
+        cd metrics
+        git add .
+        git -c user.name=Bot -c [email protected] commit --message 📈
+        git push origin master
+    env:
+      METRICS_TOKEN: ${{ secrets.METRICS_TOKEN }}