From dbd912a98b916dc5c034ec9419ac4612a612d9ce Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Wed, 26 Jun 2024 14:10:49 -0700 Subject: [PATCH 1/6] Windows support --- .github/workflows/cargo.yml | 58 +++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index ffbe6acd..49df1d9d 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macos-12 ] + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-rust @@ -39,6 +39,21 @@ jobs: run: | cargo hack --feature-powerset check --locked + check-windows: + name: check-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ windows-latest ] + steps: + - uses: actions/checkout@v3 + - uses: Swatinem/rust-cache@v2 + with: + shared-key: check-${{ matrix.os }} + - name: cargo check + run: | + cargo check --all-targets + clippy: runs-on: ubuntu-latest steps: @@ -108,7 +123,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macos-12 ] + os: [ ubuntu-latest, macos-latest ] profile: [ release, debug ] steps: - uses: actions/checkout@v3 @@ -153,12 +168,51 @@ jobs: name: binaries path: install + build-windows: + name: build-${{ matrix.os }}-${{ matrix.profile }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ windows-latest ] + profile: [ release, debug ] + steps: + - uses: actions/checkout@v3 + - uses: Swatinem/rust-cache@v2 + with: + shared-key: build-${{ matrix.os }}-${{ matrix.profile }} + + - name: Update cargo flags + if: ${{ matrix.profile == 'release' }} + run: echo 'FLAGS=--release' >> $GITHUB_ENV + shell: bash + - name: Update cargo flags + if: ${{ matrix.profile == 'debug' }} + run: echo 'FLAGS=' >> $GITHUB_ENV + shell: bash + + - name: build + shell: bash + run: | + cargo build --workspace --exclude momento-proxy --all-features --all-targets --locked ${{ env.FLAGS }} + - name: test + shell: bash + run: | + cargo test --workspace --exclude momento-proxy --all-features --tests --lib --bins --examples --locked ${{ env.FLAGS }} + - name: doctests + if: ${{ matrix.profile == 'debug' }} + shell: bash + run: | + cargo test --workspace --exclude momento-proxy --all-features --doc --locked -- --test-threads 16 + check-success: name: verify all tests pass runs-on: ubuntu-latest needs: - build + - build-windows - check + - check-powerset + - check-windows - rustfmt - clippy - clippy-upload From 25b2c3341875660f506f34b269c94eaf3974d20b Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Wed, 26 Jun 2024 14:12:06 -0700 Subject: [PATCH 2/6] bump awaken version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7aab1af0..01087da1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ members = [ [workspace.dependencies] ahash = "0.8.7" arrayvec = "0.7.4" -awaken = "0.1.0" +awaken = "0.2.0" backtrace = "0.3.69" bitvec = "1.0.1" blake3 = "1.5.0" From 814c3db2053bd8a9b99372e096381b93c46b4257 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Wed, 26 Jun 2024 14:12:47 -0700 Subject: [PATCH 3/6] bump switchboard version --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6906623..2d1a3fd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,9 +185,9 @@ checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "awaken" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd279f60d540c599125bfe1ac89293a411f8fed25fedbfbf3dc114eb6f0dc6df" +checksum = "e0e5ca6a22c7592d882e26ea5b84d5653265b83a93e0280b74aee42cc912f21d" dependencies = [ "libc", "mio", @@ -2334,9 +2334,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "switchboard" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3578ed09f106e5254e636e6218d1dde3c2bab900f76f44c15e136c3161778fc" +checksum = "81b68be1047904c7ce69a790fc28a0888004169c3699a055721aa114a7e1c29d" dependencies = [ "awaken", "crossbeam-queue", diff --git a/Cargo.toml b/Cargo.toml index 01087da1..6fa62756 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ serde = "1.0.189" serde_json = "1.0.107" signal-hook = "0.3.17" slab = "0.4.9" -switchboard = "0.2.1" +switchboard = "0.3.0" syn = "2.0.38" thiserror = "1.0.49" tiny_http = "0.12.0" From 8425cd12fbd11fd987c3e85825e84710a870c66e Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Wed, 26 Jun 2024 14:14:21 -0700 Subject: [PATCH 4/6] try to fix the ci --- .github/workflows/cargo.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index 49df1d9d..cb259828 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -211,7 +211,6 @@ jobs: - build - build-windows - check - - check-powerset - check-windows - rustfmt - clippy From 2cee0edb4a71ba700e3b01e392ee6dd727494ff4 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Wed, 26 Jun 2024 14:15:38 -0700 Subject: [PATCH 5/6] try to fix the ci --- .github/workflows/cargo.yml | 102 ++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index cb259828..be84bb13 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -39,20 +39,20 @@ jobs: run: | cargo hack --feature-powerset check --locked - check-windows: - name: check-${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ windows-latest ] - steps: - - uses: actions/checkout@v3 - - uses: Swatinem/rust-cache@v2 - with: - shared-key: check-${{ matrix.os }} - - name: cargo check - run: | - cargo check --all-targets + # check-windows: + # name: check-${{ matrix.os }} + # runs-on: ${{ matrix.os }} + # strategy: + # matrix: + # os: [ windows-latest ] + # steps: + # - uses: actions/checkout@v3 + # - uses: Swatinem/rust-cache@v2 + # with: + # shared-key: check-${{ matrix.os }} + # - name: cargo check + # run: | + # cargo check --all-targets clippy: runs-on: ubuntu-latest @@ -168,50 +168,50 @@ jobs: name: binaries path: install - build-windows: - name: build-${{ matrix.os }}-${{ matrix.profile }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ windows-latest ] - profile: [ release, debug ] - steps: - - uses: actions/checkout@v3 - - uses: Swatinem/rust-cache@v2 - with: - shared-key: build-${{ matrix.os }}-${{ matrix.profile }} - - - name: Update cargo flags - if: ${{ matrix.profile == 'release' }} - run: echo 'FLAGS=--release' >> $GITHUB_ENV - shell: bash - - name: Update cargo flags - if: ${{ matrix.profile == 'debug' }} - run: echo 'FLAGS=' >> $GITHUB_ENV - shell: bash - - - name: build - shell: bash - run: | - cargo build --workspace --exclude momento-proxy --all-features --all-targets --locked ${{ env.FLAGS }} - - name: test - shell: bash - run: | - cargo test --workspace --exclude momento-proxy --all-features --tests --lib --bins --examples --locked ${{ env.FLAGS }} - - name: doctests - if: ${{ matrix.profile == 'debug' }} - shell: bash - run: | - cargo test --workspace --exclude momento-proxy --all-features --doc --locked -- --test-threads 16 + # build-windows: + # name: build-${{ matrix.os }}-${{ matrix.profile }} + # runs-on: ${{ matrix.os }} + # strategy: + # matrix: + # os: [ windows-latest ] + # profile: [ release, debug ] + # steps: + # - uses: actions/checkout@v3 + # - uses: Swatinem/rust-cache@v2 + # with: + # shared-key: build-${{ matrix.os }}-${{ matrix.profile }} + + # - name: Update cargo flags + # if: ${{ matrix.profile == 'release' }} + # run: echo 'FLAGS=--release' >> $GITHUB_ENV + # shell: bash + # - name: Update cargo flags + # if: ${{ matrix.profile == 'debug' }} + # run: echo 'FLAGS=' >> $GITHUB_ENV + # shell: bash + + # - name: build + # shell: bash + # run: | + # cargo build --workspace --exclude momento-proxy --all-features --all-targets --locked ${{ env.FLAGS }} + # - name: test + # shell: bash + # run: | + # cargo test --workspace --exclude momento-proxy --all-features --tests --lib --bins --examples --locked ${{ env.FLAGS }} + # - name: doctests + # if: ${{ matrix.profile == 'debug' }} + # shell: bash + # run: | + # cargo test --workspace --exclude momento-proxy --all-features --doc --locked -- --test-threads 16 check-success: name: verify all tests pass runs-on: ubuntu-latest needs: - build - - build-windows + # - build-windows - check - - check-windows + # - check-windows - rustfmt - clippy - clippy-upload From 2177d3503ade91c2e5d16427cf62a69b63ffa6e8 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Wed, 26 Jun 2024 14:16:30 -0700 Subject: [PATCH 6/6] try to fix the ci --- .github/workflows/cargo.yml | 57 ++----------------------------------- 1 file changed, 2 insertions(+), 55 deletions(-) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index be84bb13..ffbe6acd 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macos-latest ] + os: [ ubuntu-latest, macos-12 ] steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-rust @@ -39,21 +39,6 @@ jobs: run: | cargo hack --feature-powerset check --locked - # check-windows: - # name: check-${{ matrix.os }} - # runs-on: ${{ matrix.os }} - # strategy: - # matrix: - # os: [ windows-latest ] - # steps: - # - uses: actions/checkout@v3 - # - uses: Swatinem/rust-cache@v2 - # with: - # shared-key: check-${{ matrix.os }} - # - name: cargo check - # run: | - # cargo check --all-targets - clippy: runs-on: ubuntu-latest steps: @@ -123,7 +108,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macos-latest ] + os: [ ubuntu-latest, macos-12 ] profile: [ release, debug ] steps: - uses: actions/checkout@v3 @@ -168,50 +153,12 @@ jobs: name: binaries path: install - # build-windows: - # name: build-${{ matrix.os }}-${{ matrix.profile }} - # runs-on: ${{ matrix.os }} - # strategy: - # matrix: - # os: [ windows-latest ] - # profile: [ release, debug ] - # steps: - # - uses: actions/checkout@v3 - # - uses: Swatinem/rust-cache@v2 - # with: - # shared-key: build-${{ matrix.os }}-${{ matrix.profile }} - - # - name: Update cargo flags - # if: ${{ matrix.profile == 'release' }} - # run: echo 'FLAGS=--release' >> $GITHUB_ENV - # shell: bash - # - name: Update cargo flags - # if: ${{ matrix.profile == 'debug' }} - # run: echo 'FLAGS=' >> $GITHUB_ENV - # shell: bash - - # - name: build - # shell: bash - # run: | - # cargo build --workspace --exclude momento-proxy --all-features --all-targets --locked ${{ env.FLAGS }} - # - name: test - # shell: bash - # run: | - # cargo test --workspace --exclude momento-proxy --all-features --tests --lib --bins --examples --locked ${{ env.FLAGS }} - # - name: doctests - # if: ${{ matrix.profile == 'debug' }} - # shell: bash - # run: | - # cargo test --workspace --exclude momento-proxy --all-features --doc --locked -- --test-threads 16 - check-success: name: verify all tests pass runs-on: ubuntu-latest needs: - build - # - build-windows - check - # - check-windows - rustfmt - clippy - clippy-upload