From 5475129ca4d77749dde07e5aae7e8bdf6a334eb4 Mon Sep 17 00:00:00 2001 From: Jeffsky Date: Fri, 29 Nov 2024 14:43:30 +0800 Subject: [PATCH] feat: rename capybara to capybara-bin because of conflict capybara crates --- .github/workflows/rust-publish.yml | 38 +++++++++---------- Cargo.toml | 2 +- {capybara => capybara-bin}/Cargo.toml | 2 +- {capybara => capybara-bin}/README.md | 0 .../src/bootstrap/config.rs | 0 .../src/bootstrap/mod.rs | 0 .../src/bootstrap/runtime.rs | 0 {capybara => capybara-bin}/src/cmd/mod.rs | 0 {capybara => capybara-bin}/src/cmd/run.rs | 0 {capybara => capybara-bin}/src/main.rs | 0 .../src/provider/mod.rs | 0 .../src/provider/static_file.rs | 0 12 files changed, 21 insertions(+), 21 deletions(-) rename {capybara => capybara-bin}/Cargo.toml (97%) rename {capybara => capybara-bin}/README.md (100%) rename {capybara => capybara-bin}/src/bootstrap/config.rs (100%) rename {capybara => capybara-bin}/src/bootstrap/mod.rs (100%) rename {capybara => capybara-bin}/src/bootstrap/runtime.rs (100%) rename {capybara => capybara-bin}/src/cmd/mod.rs (100%) rename {capybara => capybara-bin}/src/cmd/run.rs (100%) rename {capybara => capybara-bin}/src/main.rs (100%) rename {capybara => capybara-bin}/src/provider/mod.rs (100%) rename {capybara => capybara-bin}/src/provider/static_file.rs (100%) diff --git a/.github/workflows/rust-publish.yml b/.github/workflows/rust-publish.yml index e7a94c2..b176168 100644 --- a/.github/workflows/rust-publish.yml +++ b/.github/workflows/rust-publish.yml @@ -22,26 +22,26 @@ jobs: toolchain: stable override: true - - name: Publish capybara-util - if: always() - run: cargo publish --token ${CRATES_TOKEN} -p capybara-util - env: - CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} - - - name: Publish capybara-etc - if: always() - run: cargo publish --token ${CRATES_TOKEN} -p capybara-etc - env: - CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} - - - name: Publish capybara-core - if: always() - run: cargo publish --token ${CRATES_TOKEN} -p capybara-core - env: - CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} +# - name: Publish capybara-util +# if: always() +# run: cargo publish --token ${CRATES_TOKEN} -p capybara-util +# env: +# CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} +# +# - name: Publish capybara-etc +# if: always() +# run: cargo publish --token ${CRATES_TOKEN} -p capybara-etc +# env: +# CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} +# +# - name: Publish capybara-core +# if: always() +# run: cargo publish --token ${CRATES_TOKEN} -p capybara-core +# env: +# CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} - - name: Publish capybara + - name: Publish capybara-bin if: always() - run: cargo publish --token ${CRATES_TOKEN} -p capybara + run: cargo publish --token ${CRATES_TOKEN} -p capybara-bin env: CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} diff --git a/Cargo.toml b/Cargo.toml index dbf6c19..913a087 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ lto = "thin" resolver = "2" members = [ - "capybara", + "capybara-bin", "capybara-core", "capybara-etc", "capybara-util", diff --git a/capybara/Cargo.toml b/capybara-bin/Cargo.toml similarity index 97% rename from capybara/Cargo.toml rename to capybara-bin/Cargo.toml index c7a81ee..584407d 100644 --- a/capybara/Cargo.toml +++ b/capybara-bin/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "capybara" +name = "capybara-bin" version = "0.0.1-alpha.1" edition = "2021" license = "MIT" diff --git a/capybara/README.md b/capybara-bin/README.md similarity index 100% rename from capybara/README.md rename to capybara-bin/README.md diff --git a/capybara/src/bootstrap/config.rs b/capybara-bin/src/bootstrap/config.rs similarity index 100% rename from capybara/src/bootstrap/config.rs rename to capybara-bin/src/bootstrap/config.rs diff --git a/capybara/src/bootstrap/mod.rs b/capybara-bin/src/bootstrap/mod.rs similarity index 100% rename from capybara/src/bootstrap/mod.rs rename to capybara-bin/src/bootstrap/mod.rs diff --git a/capybara/src/bootstrap/runtime.rs b/capybara-bin/src/bootstrap/runtime.rs similarity index 100% rename from capybara/src/bootstrap/runtime.rs rename to capybara-bin/src/bootstrap/runtime.rs diff --git a/capybara/src/cmd/mod.rs b/capybara-bin/src/cmd/mod.rs similarity index 100% rename from capybara/src/cmd/mod.rs rename to capybara-bin/src/cmd/mod.rs diff --git a/capybara/src/cmd/run.rs b/capybara-bin/src/cmd/run.rs similarity index 100% rename from capybara/src/cmd/run.rs rename to capybara-bin/src/cmd/run.rs diff --git a/capybara/src/main.rs b/capybara-bin/src/main.rs similarity index 100% rename from capybara/src/main.rs rename to capybara-bin/src/main.rs diff --git a/capybara/src/provider/mod.rs b/capybara-bin/src/provider/mod.rs similarity index 100% rename from capybara/src/provider/mod.rs rename to capybara-bin/src/provider/mod.rs diff --git a/capybara/src/provider/static_file.rs b/capybara-bin/src/provider/static_file.rs similarity index 100% rename from capybara/src/provider/static_file.rs rename to capybara-bin/src/provider/static_file.rs