From 90878e614e695227185afe707a1b8a2ce6418988 Mon Sep 17 00:00:00 2001 From: Will Crichton Date: Thu, 29 Aug 2024 20:51:42 -0700 Subject: [PATCH] v0.3.3 (#136) * v0.3.3 * Fix zone in pre-release * Include Cargo.lock in Dockerfile * Flatten zipfile * Install cargo-workspaces before checkout * Fix to old serde version to avoid breakage w/ current nightly --- .github/workflows/pre-release.yml | 6 ++-- .github/workflows/run-on-remote/action.yml | 8 ++--- Cargo.lock | 37 ++++++++------------- Cargo.toml | 3 ++ Dockerfile | 4 +-- crates/aquascope/Cargo.toml | 2 +- crates/aquascope_front/Cargo.toml | 2 +- crates/aquascope_serve/Cargo.toml | 2 +- crates/aquascope_workspace_utils/Cargo.toml | 3 +- crates/mdbook-aquascope/Cargo.toml | 4 +-- 10 files changed, 33 insertions(+), 38 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 0f0a054ee..d8a3ff7b5 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -56,7 +56,7 @@ jobs: - name: Build Aquascope serve run: cargo build -p aquascope_serve --release - name: Zip artifacts - run : zip artifacts.zip ./image.tar ./target/release/aquascope_serve + run : zip -j artifacts.zip ./image.tar ./target/release/aquascope_serve - name: Authenticate to Google Cloud uses: google-github-actions/auth@v1 with: @@ -66,7 +66,7 @@ jobs: with: version: '>= 412.0.0' - name: Upload artifacts - run: gcloud compute scp artifacts.zip gh-actions@aquascope:~/ --zone us-central1-a --tunnel-through-iap + run: gcloud compute scp artifacts.zip gh-actions@aquascope:~/ --zone us-central1-c --tunnel-through-iap update-frontend: needs: build-backend @@ -105,12 +105,12 @@ jobs: needs: [update-frontend,update-server] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - uses: actions-rs/install@v0.1 with: crate: cargo-workspaces version: latest use-tool-cache: true + - uses: actions/checkout@v3 - name: Quick Setup uses: ./.github/workflows/quick-setup # Run cargo build to ensure crates/mdbook-aquascope/js is populated diff --git a/.github/workflows/run-on-remote/action.yml b/.github/workflows/run-on-remote/action.yml index 745805674..9adaecea8 100644 --- a/.github/workflows/run-on-remote/action.yml +++ b/.github/workflows/run-on-remote/action.yml @@ -21,12 +21,12 @@ runs: with: version: '>= 412.0.0' - name: Copy to server - run: gcloud compute scp ./${{ inputs.file }} gh-actions@aquascope:~/${{ inputs.file }} --zone us-central1-a --tunnel-through-iap + run: gcloud compute scp ./${{ inputs.file }} gh-actions@aquascope:~/${{ inputs.file }} --zone us-central1-c --tunnel-through-iap shell: bash - name: Make executable uses: google-github-actions/ssh-compute@v0 with: - zone: 'us-central1-a' + zone: 'us-central1-c' project_id: ${{ inputs.project-id }} ssh_private_key: ${{ inputs.ssh-key }} instance_name: aquascope @@ -35,9 +35,9 @@ runs: - name: Execute script uses: google-github-actions/ssh-compute@v0 with: - zone: 'us-central1-a' + zone: 'us-central1-c' project_id: ${{ inputs.project-id }} ssh_private_key: ${{ inputs.ssh-key }} instance_name: aquascope user: gh-actions - command: /home/gh-actions/${{ inputs.file }} + command: "~/${{ inputs.file }}" \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index f94f800b3..2d9fa4bad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -163,9 +163,10 @@ dependencies = [ [[package]] name = "aquascope_workspace_utils" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", + "serde", "toml 0.5.11", ] @@ -1263,9 +1264,9 @@ checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" [[package]] name = "mdbook" -version = "0.4.34" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55eb7c4dad20cc5bc15181c2aaf43d5689d5c3e0b80b50cc4cf0b7fe72a26d9" +checksum = "764dcbfc2e5f868bc1b566eb179dff1a06458fd0cff846aae2579392dd3f01a0" dependencies = [ "anyhow", "chrono", @@ -1289,7 +1290,7 @@ dependencies = [ [[package]] name = "mdbook-aquascope" -version = "0.3.2" +version = "0.3.3" dependencies = [ "anyhow", "aquascope_workspace_utils", @@ -1446,15 +1447,6 @@ dependencies = [ "nom", ] -[[package]] -name = "normpath" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" -dependencies = [ - "windows-sys 0.48.0", -] - [[package]] name = "num-traits" version = "0.2.16" @@ -1491,12 +1483,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opener" -version = "0.6.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788" +checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" dependencies = [ "bstr", - "normpath", "winapi", ] @@ -1877,29 +1868,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 5643320cc..c593e615f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,9 @@ members = [ "crates/*" ] exclude = [ "files" ] resolver = "2" +[workspace.dependencies] +serde = { version = "=1.0.149", features = ["derive"] } + # Make snapshot testing faster [profile.dev.package.insta] opt-level = 3 diff --git a/Dockerfile b/Dockerfile index 79cc07f73..9fe32fffd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,13 @@ RUN rustup set profile minimal && \ rustup toolchain uninstall stable && \ rustup component add --toolchain nightly-2023-08-25 \ --target x86_64-unknown-linux-musl \ - rust-src rustc-dev llvm-tools-preview + rust-src rustc-dev llvm-tools-preview miri RUN apk add --no-cache build-base musl-dev libc-dev linux-headers WORKDIR /aquascope -COPY Cargo.toml rust-toolchain.toml ./ +COPY Cargo.toml Cargo.lock rust-toolchain.toml ./ COPY crates ./crates ENV TARGET_CC=x86_64-linux-musl-gcc diff --git a/crates/aquascope/Cargo.toml b/crates/aquascope/Cargo.toml index 443de7f36..d983ab8ed 100644 --- a/crates/aquascope/Cargo.toml +++ b/crates/aquascope/Cargo.toml @@ -21,7 +21,7 @@ testing = [] anyhow = "1.0.0" log = "0.4" itertools = "0.10.5" -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } ts-rs = "6.2" regex = "1" fluid-let = "1.0" diff --git a/crates/aquascope_front/Cargo.toml b/crates/aquascope_front/Cargo.toml index 3254349a2..2ff5328a8 100644 --- a/crates/aquascope_front/Cargo.toml +++ b/crates/aquascope_front/Cargo.toml @@ -18,7 +18,7 @@ rustc_private = true aquascope = {version = "0.1", path = "../aquascope"} anyhow = "1" log = "0.4" -serde = {version = "1", features = ["derive"]} +serde = { workspace = true } serde_json = "1" ts-rs = "6.2" itertools = "0.10.5" diff --git a/crates/aquascope_serve/Cargo.toml b/crates/aquascope_serve/Cargo.toml index 8c3a1898f..585cea138 100644 --- a/crates/aquascope_serve/Cargo.toml +++ b/crates/aquascope_serve/Cargo.toml @@ -20,7 +20,7 @@ axum = { version = "0.5" } env_logger = "0.9.0" futures = "0.3.21" log = "0.4.0" -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } serde_json = "1.0" snafu = "0.7.0" tokio = { version = "1.9", features = ["macros", "time", "process"] } diff --git a/crates/aquascope_workspace_utils/Cargo.toml b/crates/aquascope_workspace_utils/Cargo.toml index 352ca6f62..0b4ce2d36 100644 --- a/crates/aquascope_workspace_utils/Cargo.toml +++ b/crates/aquascope_workspace_utils/Cargo.toml @@ -4,7 +4,7 @@ authors = [ "Will Crichton ", "Gavin Gray " ] -version = "0.3.2" +version = "0.3.3" license = "MIT" edition = "2021" description = "Handy utilities for working in the Aquascope workspace" @@ -20,3 +20,4 @@ include = [ [dependencies] toml = "0.5" anyhow = "1" +serde = { workspace = true } \ No newline at end of file diff --git a/crates/mdbook-aquascope/Cargo.toml b/crates/mdbook-aquascope/Cargo.toml index 7d967bd4c..959aa9a1c 100644 --- a/crates/mdbook-aquascope/Cargo.toml +++ b/crates/mdbook-aquascope/Cargo.toml @@ -6,7 +6,7 @@ authors = [ ] description = "Interactive Aquascope editor for your mdBook" license = "MIT" -version = "0.3.2" +version = "0.3.3" edition = "2021" include = [ "src/**/*", @@ -27,7 +27,7 @@ anyhow = "1" tempfile = "3" html-escape = "0.2" serde_json = "1" -serde = { version = "1.0", features = ["derive"] } +serde = { workspace = true } ts-rs = "6.2" rayon = "1" aquascope_workspace_utils = {version = "0.3", path = "../aquascope_workspace_utils"}