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

@@ -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/[email protected]
         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

.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 }}"

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

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

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"

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"

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"] }

crates/aquascope_workspace_utils/Cargo.toml

@@ -4,7 +4,7 @@ authors = [
   "Will Crichton <[email protected]>",
   "Gavin Gray <[email protected]>"
 ]
-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 }

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"}