From 7aeca73de80f48788b58be9e752c81b807bb74b8 Mon Sep 17 00:00:00 2001 From: Aaron Ai Date: Sun, 2 Apr 2023 12:55:32 +0800 Subject: [PATCH] Fix rust build (#451) * Fix rust build * Test: trigger the build of rust * Add rust buid result * Revert "Test: trigger the build of rust" This reverts commit 165a27c41761e480e94c21ca00be1e7a41235218. --- .github/workflows/build.yml | 11 +++++++-- .../workflows/{rust.yml => rust_build.yml} | 23 +++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) rename .github/workflows/{rust.yml => rust_build.yml} (54%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87506fa3d..e0a05767f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,7 @@ jobs: golang: ${{ steps.filter.outputs.golang }} csharp: ${{ steps.filter.outputs.csharp }} php: ${{ steps.filter.outputs.php }} + rust: ${{ steps.filter.outputs.rust }} steps: - uses: actions/checkout@v2 - uses: dorny/paths-filter@v2 @@ -31,6 +32,8 @@ jobs: - 'csharp/**' php: - 'php/**' + rust: + - 'rust/**' java-build: needs: [paths-filter] if: ${{ needs.paths-filter.outputs.java == 'true' }} @@ -52,15 +55,19 @@ jobs: needs: [paths-filter] if: ${{ needs.paths-filter.outputs.php == 'true' }} uses: ./.github/workflows/php_build.yml + rust-build: + needs: [paths-filter] + if: ${{ needs.paths-filter.outputs.rust == 'true' }} + uses: ./.github/workflows/rust_build.yml build-result: runs-on: ubuntu-latest - needs: [java-build, cpp-build, csharp-build, golang-build, php-build] + needs: [java-build, cpp-build, csharp-build, golang-build, php-build, rust-build] if: ${{ always() }} steps: - uses: actions/checkout@v2 - name: Collect build result run: | - if echo java-${{ needs.java-build.result }},cpp-${{ needs.cpp-build.result }},csharp-${{ needs.csharp-build.result }},golang-${{ needs.golang-build.result }},php-${{ needs.php-build.result }} | grep -E 'cancelled|failure' -o > null + if echo java-${{ needs.java-build.result }},cpp-${{ needs.cpp-build.result }},csharp-${{ needs.csharp-build.result }},golang-${{ needs.golang-build.result }},php-${{ needs.php-build.result }},rust-${{ needs.rust-build.result }} | grep -E 'cancelled|failure' -o > null then echo "There are failed/cancelled builds" exit 1 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust_build.yml similarity index 54% rename from .github/workflows/rust.yml rename to .github/workflows/rust_build.yml index 27c2a5d39..c9f842d09 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust_build.yml @@ -1,20 +1,13 @@ -name: Rust +name: Rust Build on: - pull_request: - types: [opened, reopened, synchronize] - paths: - - 'rust/**' - push: - branches: - - master - - rust_dev - paths: - - 'rust/**' - + workflow_call: jobs: - build_and_test: - name: Rust project - runs-on: ubuntu-latest + build: + name: "${{ matrix.os }}" + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-20.04, macos-11, windows-2022] steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1