diff options
| author | Aleksey Kladov <[email protected]> | 2020-03-04 17:17:26 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-04 17:17:26 +0000 |
| commit | ae6109a68ce6980bdaeb3824adfc14417d40aa4a (patch) | |
| tree | 7b86d3d9a4df5c3875a16e7adf7e49bfecef0d75 | |
| parent | 8ac7a180cf8f08c8c6649c6f06709198425a58a1 (diff) | |
| parent | e5aed5c593c64336cd53ca0ddfcff59009cae534 (diff) | |
Merge pull request #3457 from matklad/simple-ci
Remove needless dep
| -rw-r--r-- | .github/workflows/ci.yaml | 9 | ||||
| -rw-r--r-- | .github/workflows/release.yaml | 10 | ||||
| -rw-r--r-- | .github/workflows/rustdoc.yaml | 17 |
3 files changed, 10 insertions, 26 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 74ce147ae..633015956 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml | |||
| @@ -74,15 +74,10 @@ jobs: | |||
| 74 | key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} | 74 | key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} |
| 75 | 75 | ||
| 76 | - name: Compile | 76 | - name: Compile |
| 77 | uses: actions-rs/cargo@v1 | 77 | run: cargo test --no-run |
| 78 | with: | ||
| 79 | command: test | ||
| 80 | args: --no-run | ||
| 81 | 78 | ||
| 82 | - name: Test | 79 | - name: Test |
| 83 | uses: actions-rs/cargo@v1 | 80 | run: cargo test |
| 84 | with: | ||
| 85 | command: test | ||
| 86 | 81 | ||
| 87 | - name: Prepare cache | 82 | - name: Prepare cache |
| 88 | run: cargo xtask pre-cache | 83 | run: cargo xtask pre-cache |
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 30f1ff22f..aef961671 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml | |||
| @@ -43,19 +43,13 @@ jobs: | |||
| 43 | 43 | ||
| 44 | - name: Build | 44 | - name: Build |
| 45 | if: matrix.os == 'ubuntu-latest' | 45 | if: matrix.os == 'ubuntu-latest' |
| 46 | uses: actions-rs/cargo@v1 | 46 | run: cargo build --package rust-analyzer --bin rust-analyzer --release --target x86_64-unknown-linux-musl |
| 47 | env: | 47 | env: |
| 48 | CC: clang | 48 | CC: clang |
| 49 | with: | ||
| 50 | command: build | ||
| 51 | args: --package rust-analyzer --bin rust-analyzer --release --target x86_64-unknown-linux-musl | ||
| 52 | 49 | ||
| 53 | - name: Build | 50 | - name: Build |
| 54 | if: matrix.os != 'ubuntu-latest' | 51 | if: matrix.os != 'ubuntu-latest' |
| 55 | uses: actions-rs/cargo@v1 | 52 | run: cargo build --package rust-analyzer --bin rust-analyzer --release |
| 56 | with: | ||
| 57 | command: build | ||
| 58 | args: --package rust-analyzer --bin rust-analyzer --release | ||
| 59 | 53 | ||
| 60 | - name: Create distribution dir | 54 | - name: Create distribution dir |
| 61 | run: mkdir ./dist | 55 | run: mkdir ./dist |
diff --git a/.github/workflows/rustdoc.yaml b/.github/workflows/rustdoc.yaml index 66c8887ad..1f4a3cfd3 100644 --- a/.github/workflows/rustdoc.yaml +++ b/.github/workflows/rustdoc.yaml | |||
| @@ -24,16 +24,11 @@ jobs: | |||
| 24 | components: rustfmt, rust-src | 24 | components: rustfmt, rust-src |
| 25 | 25 | ||
| 26 | - name: Build Documentation | 26 | - name: Build Documentation |
| 27 | uses: actions-rs/cargo@v1 | 27 | run: cargo doc --all --no-deps |
| 28 | with: | ||
| 29 | command: doc | ||
| 30 | args: --all --no-deps | ||
| 31 | 28 | ||
| 32 | - name: Deploy Docs | 29 | - name: Deploy Docs |
| 33 | uses: peaceiris/[email protected] | 30 | uses: peaceiris/actions-gh-pages@364c31d33bb99327c77b3a5438a83a357a6729ad # v3.4.0 |
| 34 | env: | 31 | github_token: ${{ secrets.GITHUB_TOKEN }} |
| 35 | ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} | 32 | publish_branch: gh-pages |
| 36 | PUBLISH_BRANCH: gh-pages | 33 | publish_dir: ./book |
| 37 | PUBLISH_DIR: ./target/doc | 34 | force_orphan: true |
| 38 | with: | ||
| 39 | forceOrphan: true | ||