From 81d0fdaed100a6fa066662f8f55138e459eab536 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Mon, 10 Mar 2025 10:20:15 -0400 Subject: [PATCH 1/6] Test windows runners --- .github/workflows/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d08dc95d02bc61..50c7dd355118b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -271,12 +271,12 @@ jobs: run: | Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.ZED_WORKSPACE }}" -Recurse - - name: Cache dependencies - uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 - with: - save-if: ${{ github.ref == 'refs/heads/main' }} - workspaces: ${{ env.ZED_WORKSPACE }} - cache-provider: "github" + # - name: Cache dependencies + # uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 + # with: + # save-if: ${{ github.ref == 'refs/heads/main' }} + # workspaces: ${{ env.ZED_WORKSPACE }} + # cache-provider: "github" - name: Configure CI run: | @@ -338,12 +338,12 @@ jobs: run: | Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.ZED_WORKSPACE }}" -Recurse - - name: Cache dependencies - uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 - with: - save-if: ${{ github.ref == 'refs/heads/main' }} - workspaces: ${{ env.ZED_WORKSPACE }} - cache-provider: "github" + # - name: Cache dependencies + # uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 + # with: + # save-if: ${{ github.ref == 'refs/heads/main' }} + # workspaces: ${{ env.ZED_WORKSPACE }} + # cache-provider: "github" - name: Configure CI run: | From e055852d3d9cc5b792068e55667d0b2ba5953f47 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Mon, 10 Mar 2025 10:25:35 -0400 Subject: [PATCH 2/6] commit2 --- .github/workflows/ci.yml | 1 + Cargo.toml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50c7dd355118b8..89410a032fa2be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -271,6 +271,7 @@ jobs: run: | Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.ZED_WORKSPACE }}" -Recurse + # commit 2 # - name: Cache dependencies # uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 # with: diff --git a/Cargo.toml b/Cargo.toml index 859beb2b2864ed..4afecf3294c145 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -753,3 +753,5 @@ let_underscore_future = "allow" [workspace.metadata.cargo-machete] ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme"] + +# comment1 From b3b5d792523bfe925f2af03146ecaa2c8ff8d4b3 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Mon, 10 Mar 2025 10:51:05 -0400 Subject: [PATCH 3/6] A second run --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4afecf3294c145..c144cda7dceeda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -754,4 +754,4 @@ let_underscore_future = "allow" [workspace.metadata.cargo-machete] ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme"] -# comment1 +# comment2 From 857572695d3d8241fc79cdef1572b1a44012ac0f Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Mon, 10 Mar 2025 12:38:34 -0400 Subject: [PATCH 4/6] comment3 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c144cda7dceeda..7d6b1f838311c0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -754,4 +754,4 @@ let_underscore_future = "allow" [workspace.metadata.cargo-machete] ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme"] -# comment2 +# comment3 From fb0453d60da53fd9463fb5caf2c618af236578e1 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Mon, 10 Mar 2025 12:44:31 -0400 Subject: [PATCH 5/6] Restore cache --- .github/workflows/ci.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89410a032fa2be..d08dc95d02bc61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -271,13 +271,12 @@ jobs: run: | Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.ZED_WORKSPACE }}" -Recurse - # commit 2 - # - name: Cache dependencies - # uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 - # with: - # save-if: ${{ github.ref == 'refs/heads/main' }} - # workspaces: ${{ env.ZED_WORKSPACE }} - # cache-provider: "github" + - name: Cache dependencies + uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 + with: + save-if: ${{ github.ref == 'refs/heads/main' }} + workspaces: ${{ env.ZED_WORKSPACE }} + cache-provider: "github" - name: Configure CI run: | @@ -339,12 +338,12 @@ jobs: run: | Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.ZED_WORKSPACE }}" -Recurse - # - name: Cache dependencies - # uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 - # with: - # save-if: ${{ github.ref == 'refs/heads/main' }} - # workspaces: ${{ env.ZED_WORKSPACE }} - # cache-provider: "github" + - name: Cache dependencies + uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2 + with: + save-if: ${{ github.ref == 'refs/heads/main' }} + workspaces: ${{ env.ZED_WORKSPACE }} + cache-provider: "github" - name: Configure CI run: | From a119073058eaa638ad02dacb527c66cef08e74ec Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Mon, 10 Mar 2025 13:13:08 -0400 Subject: [PATCH 6/6] Remove comment --- Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7d6b1f838311c0..859beb2b2864ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -753,5 +753,3 @@ let_underscore_future = "allow" [workspace.metadata.cargo-machete] ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme"] - -# comment3