diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 728c936..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: ๐Œš Release - -on: - workflow_dispatch: - inputs: - force-publish: - required: true - type: boolean - description: Publish Releases at Anytime - - workflow_run: - workflows: [ ๐Ÿงช Tests and Checks ] - branches: [main] - types: [ completed ] - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - release-please: - runs-on: ubuntu-latest - if: > - github.ref == 'refs/heads/main' && - github.repository_owner == 'fission-codes' && - github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' - - outputs: - releases_created: ${{ steps.release.outputs['car-mirror--release_created'] || steps.release.outputs['car-mirror-wasm--release_created'] }} - wasm_release_created: ${{ steps.release.outputs['car-mirror-wasm--release_created'] }} - - steps: - - name: Run release-please - id: release - uses: google-github-actions/release-please-action@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - default-branch: main - command: manifest - extra-files: | - README.md - - - publish-release-crates: - if: ${{ needs.release-please.outputs.releases_created || github.event.inputs.force-publish }} - - runs-on: ubuntu-latest - needs: [ release-please ] - - permissions: - contents: write - - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Cache Project - uses: Swatinem/rust-cache@v2 - - - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 - with: - override: true - profile: minimal - toolchain: stable - - - name: Install Cargo Workspaces - env: - RUSTFLAGS: '-Copt-level=1' - uses: actions-rs/cargo@v1 - with: - args: --force cargo-workspaces - command: install - - - name: Verify Publishing of crate - uses: katyo/publish-crates@v2 - with: - dry-run: true - - - name: Cargo Publish to crates.io - env: - CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} - run: cargo workspaces publish --from-git - - publish-release-npm: - if: ${{ needs.release-please.outputs.wasm_release_created || github.event.inputs.force-publish }} - - runs-on: ubuntu-latest - needs: [ release-please ] - - permissions: - contents: write - - defaults: - run: - working-directory: ./car-mirror-wasm - - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Cache Project - uses: Swatinem/rust-cache@v2 - - - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 - with: - override: true - profile: minimal - toolchain: stable - - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: '16.x' - registry-url: 'https://registry.npmjs.org' - - - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - - # Builds output via wasm-pack and renames package.json name to remove - # `-wasm`. - - name: Build - run: | - wasm-pack build --target web --out-name car-mirror - sed -i -e 's/"name": "car-mirror-wasm"/"name": "car-mirror",\n "type": "module"/g' pkg/package.json - - - name: Publish to npm - run: wasm-pack publish - working-directory: pkg - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.release-please-manifest.json b/.release-please-manifest.json deleted file mode 100644 index f621a8c..0000000 --- a/.release-please-manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "car-mirror": "0.1.0", - "car-mirror-wasm": "0.1.0" -} diff --git a/Cargo.lock b/Cargo.lock index be4157f..bbf156b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -684,8 +684,6 @@ dependencies = [ name = "car-mirror-wasm" version = "0.1.0" dependencies = [ - "anyhow", - "bytes", "car-mirror", "console_error_panic_hook", "futures", diff --git a/car-mirror-axum/Cargo.toml b/car-mirror-axum/Cargo.toml index 60486d2..e9925db 100644 --- a/car-mirror-axum/Cargo.toml +++ b/car-mirror-axum/Cargo.toml @@ -22,14 +22,12 @@ anyhow = "1.0" async-trait = "0.1" axum = { version = "0.7", features = ["http1", "http2"] } axum-macros = "0.4" -axum-server = { version = "0.6.0", features = ["tls-rustls"] } bytes = "1.4" car-mirror = { version = "0.1", path = "../car-mirror", features = ["quick_cache"] } futures = "0.3" http = "1.0" libipld = "0.16" mime = "0.3" -rcgen = "0.12.1" serde = "^1" serde_ipld_dagcbor = { workspace = true } thiserror = "1.0" @@ -37,16 +35,18 @@ tokio = { version = "1.0", features = ["rt-multi-thread"] } tokio-util = { version = "0.7", features = ["io"] } tower-http = { version = "0.5", features = ["cors", "trace"] } tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "parking_lot", "registry"] } wnfs-common = { workspace = true } [dev-dependencies] -axum-server-dual-protocol = "0.6.0" +axum-server = { version = "0.6", features = ["tls-rustls"] } +axum-server-dual-protocol = "0.6" rand = "0.8" rand_chacha = "0.3" +rcgen = "0.12" test-log = { version = "0.2", default-features = false, features = ["trace"] } test-strategy = "0.3" testresult = "0.3" +tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "parking_lot", "registry"] } wnfs-unixfs-file = { workspace = true } [package.metadata.docs.rs] diff --git a/car-mirror-wasm/Cargo.toml b/car-mirror-wasm/Cargo.toml index 6ee76bb..edd7f99 100644 --- a/car-mirror-wasm/Cargo.toml +++ b/car-mirror-wasm/Cargo.toml @@ -18,8 +18,6 @@ crate-type = ["cdylib", "rlib"] path = "src/lib.rs" [dependencies] -anyhow = { workspace = true } -bytes = { workspace = true } car-mirror = { path = "../car-mirror" } # The `console_error_panic_hook` crate provides better debugging of panics by # logging them with `console.error`. This is great for development, but requires diff --git a/init-msg.rhai b/init-msg.rhai deleted file mode 100644 index afa8e1f..0000000 --- a/init-msg.rhai +++ /dev/null @@ -1,10 +0,0 @@ -print(); -if variable::get("is_init") { - print("\ - If the generator detects a directory or file that already exists, it will not alter your project,\n\ - so read the prompts carefully."); - print(); -} - -print("Note: this template is for working with a cargo workspace of packages."); -print(); diff --git a/release-please-config.json b/release-please-config.json deleted file mode 100644 index 1f983a9..0000000 --- a/release-please-config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "plugins": ["cargo-workspace"], - "changelog-path": "CHANGELOG.md", - "release-type": "rust", - "bump-minor-pre-major": true, - "bump-patch-for-minor-pre-major": true, - "packages": { - "car-mirror": {}, - "car-mirror-wasm": {} - } -}