From d7ecc1b8829baef1d4c3ba12ddc747d99b985f0f Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Thu, 6 Jun 2024 22:00:01 +0800 Subject: [PATCH 1/3] another fix CI Signed-off-by: Ping Yu --- .github/workflows/build.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10a59867f06..5612d1630da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,13 +10,16 @@ on: - master - cse +env: + CSE_RUST_VERSION: 'nightly-2022-11-15' + jobs: unit_tests: name: Unit tests strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - rust: [stable, beta, nightly] + os: [ubuntu-latest] + rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} steps: @@ -42,8 +45,8 @@ jobs: name: Integration test compilation check strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - rust: [stable, beta, nightly] + os: [ubuntu-latest] + rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} steps: @@ -70,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - rust: [stable, beta, nightly] + rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} steps: @@ -96,8 +99,8 @@ jobs: name: Rustls unit tests strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - rust: [stable, beta, nightly] + os: [ubuntu-latest] + rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.rust == 'nightly' }} steps: @@ -123,7 +126,8 @@ jobs: name: Crate generation strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest] + rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -143,7 +147,7 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Generate crates - run: make generate + run: RUST_VERSION=$CSE_RUST_VERSION make generate struct_serialize_feature_test: name: Serialize Struct Feature @@ -162,7 +166,7 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Run Checks - run: make serialize_structs_limited_test + run: RUST_VERSION=$CSE_RUST_VERSION make serialize_structs_limited_test skeptic: name: Skeptic tests @@ -181,7 +185,7 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Skeptic Test - run: make skeptical + run: RUST_VERSION=$CSE_RUST_VERSION make skeptical s3_and_crategen: name: Test S3 like services and check generated files @@ -202,4 +206,4 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Test S3 like services and check generated files - run: ci/run.sh + run: RUST_VERSION=$CSE_RUST_VERSION ci/run.sh From d37d2473e18a32087893d759d3cc213994d5d334 Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Thu, 6 Jun 2024 22:14:35 +0800 Subject: [PATCH 2/3] fix Signed-off-by: Ping Yu --- .github/workflows/build.yml | 41 +++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5612d1630da..ab7833c592e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: - cse env: - CSE_RUST_VERSION: 'nightly-2022-11-15' + RUST_VERSION: 'nightly-2022-11-15' jobs: unit_tests: @@ -19,16 +19,14 @@ jobs: strategy: matrix: os: [ubuntu-latest] - rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} - continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - name: Checkout uses: actions/checkout@v1 - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: ${{ matrix.rust }} + rust-version: $RUST_VERSION - name: Cache uses: actions/cache@v2 with: @@ -39,23 +37,21 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Run unit tests shell: bash - run: RUST_VERSION=${{ matrix.rust }} make unit_test_no_doctests + run: make unit_test_no_doctests integration_tests: name: Integration test compilation check strategy: matrix: os: [ubuntu-latest] - rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} - continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - name: Checkout uses: actions/checkout@v1 - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: ${{ matrix.rust }} + rust-version: $RUST_VERSION - name: Cache uses: actions/cache@v2 with: @@ -66,23 +62,21 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Cargo check integration tests shell: bash - run: RUST_VERSION=${{ matrix.rust }} make check_integration_test + run: make check_integration_test credentials_integration_tests: name: Credentials integration test strategy: matrix: os: [ubuntu-latest] - rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} - continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - name: Checkout uses: actions/checkout@v1 - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: ${{ matrix.rust }} + rust-version: $RUST_VERSION - name: Cache uses: actions/cache@v2 with: @@ -93,23 +87,21 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Credential integration tests shell: bash - run: RUST_VERSION=${{ matrix.rust }} make credential_integration_test + run: make credential_integration_test rustls_unit_tests: name: Rustls unit tests strategy: matrix: os: [ubuntu-latest] - rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} - continue-on-error: ${{ matrix.rust == 'nightly' }} steps: - name: Checkout uses: actions/checkout@v1 - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: ${{ matrix.rust }} + rust-version: $RUST_VERSION - name: Cache uses: actions/cache@v2 with: @@ -120,14 +112,13 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Run unit tests with rustls shell: bash - run: RUST_VERSION=${{ matrix.rust }} make rustls_unit_test_no_doctests + run: make rustls_unit_test_no_doctests crate_gen: name: Crate generation strategy: matrix: os: [ubuntu-latest] - rust: [stable, $CSE_RUST_VERSION] runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -137,6 +128,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: + rust-version: $RUST_VERSION components: rustfmt - name: Cache uses: actions/cache@v2 @@ -147,7 +139,7 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Generate crates - run: RUST_VERSION=$CSE_RUST_VERSION make generate + run: make generate struct_serialize_feature_test: name: Serialize Struct Feature @@ -157,6 +149,8 @@ jobs: uses: actions/checkout@v1 - name: Set up Rust uses: hecrj/setup-rust-action@v1 + with: + rust-version: $RUST_VERSION - name: Cache uses: actions/cache@v2 with: @@ -166,7 +160,7 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Run Checks - run: RUST_VERSION=$CSE_RUST_VERSION make serialize_structs_limited_test + run: make serialize_structs_limited_test skeptic: name: Skeptic tests @@ -176,6 +170,8 @@ jobs: uses: actions/checkout@v1 - name: Set up Rust uses: hecrj/setup-rust-action@v1 + with: + rust-version: $RUST_VERSION - name: Cache uses: actions/cache@v2 with: @@ -185,7 +181,7 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Skeptic Test - run: RUST_VERSION=$CSE_RUST_VERSION make skeptical + run: make skeptical s3_and_crategen: name: Test S3 like services and check generated files @@ -196,6 +192,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: + rust-version: $RUST_VERSION components: rustfmt - name: Cache uses: actions/cache@v2 @@ -206,4 +203,4 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Test S3 like services and check generated files - run: RUST_VERSION=$CSE_RUST_VERSION ci/run.sh + run: ci/run.sh From 4f5c0876de134851444aad79a73c7ed1ef6f4bff Mon Sep 17 00:00:00 2001 From: Ping Yu Date: Thu, 6 Jun 2024 22:18:57 +0800 Subject: [PATCH 3/3] fix Signed-off-by: Ping Yu --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab7833c592e..75b24bc8977 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: $RUST_VERSION + rust-version: ${{ env.RUST_VERSION }} - name: Cache uses: actions/cache@v2 with: @@ -51,7 +51,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: $RUST_VERSION + rust-version: ${{ env.RUST_VERSION }} - name: Cache uses: actions/cache@v2 with: @@ -76,7 +76,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: $RUST_VERSION + rust-version: ${{ env.RUST_VERSION }} - name: Cache uses: actions/cache@v2 with: @@ -101,7 +101,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: $RUST_VERSION + rust-version: ${{ env.RUST_VERSION }} - name: Cache uses: actions/cache@v2 with: @@ -128,7 +128,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: $RUST_VERSION + rust-version: ${{ env.RUST_VERSION }} components: rustfmt - name: Cache uses: actions/cache@v2 @@ -150,7 +150,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: $RUST_VERSION + rust-version: ${{ env.RUST_VERSION }} - name: Cache uses: actions/cache@v2 with: @@ -171,7 +171,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: $RUST_VERSION + rust-version: ${{ env.RUST_VERSION }} - name: Cache uses: actions/cache@v2 with: @@ -192,7 +192,7 @@ jobs: - name: Set up Rust uses: hecrj/setup-rust-action@v1 with: - rust-version: $RUST_VERSION + rust-version: ${{ env.RUST_VERSION }} components: rustfmt - name: Cache uses: actions/cache@v2