From a0fe804fa4477fa70fdf39c44b2915567db94c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20B=C3=B8ving?= Date: Mon, 13 Feb 2023 17:54:30 +0100 Subject: [PATCH] Don't run typeshare if it is not installed This is done since right now installing typeshare-cli take 5 minutes out of 15 minutes in CI. --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 6 +++--- Justfile | 8 +++++++- inspectify/ui/src/lib/types.ts | 6 ------ xtask/src/main.rs | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 928111c6..6c899b87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: - uses: taiki-e/install-action@v2 with: - tool: just,typeshare-cli + tool: just - uses: jetli/wasm-pack-action@v0.4.0 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc4dd059..16235cc7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,8 +34,8 @@ on: - v[0-9]+.* env: - ALL_CARGO_DIST_TARGET_ARGS: --target=x86_64-unknown-linux-gnu --target=x86_64-apple-darwin --target=x86_64-pc-windows-msvc - ALL_CARGO_DIST_INSTALLER_ARGS: --installer=github-shell --installer=github-powershell + ALL_CARGO_DIST_TARGET_ARGS: --target=x86_64-unknown-linux-gnu --target=x86_64-apple-darwin --target=x86_64-pc-windows-msvc + ALL_CARGO_DIST_INSTALLER_ARGS: --installer=github-shell --installer=github-powershell jobs: # Create the Github Release™️ so the packages have something to be uploaded to @@ -81,7 +81,7 @@ jobs: - name: Install just and typeshare uses: taiki-e/install-action@v2 with: - tool: just,typeshare-cli + tool: just - name: Install wasm-pack uses: jetli/wasm-pack-action@v0.4.0 with: diff --git a/Justfile b/Justfile index 7bf361db..eef3d171 100644 --- a/Justfile +++ b/Justfile @@ -5,7 +5,13 @@ watch-web: cd inspectify/ui; npm run dev typeshare: - typeshare . --lang=typescript --output-file=./inspectify/ui/src/lib/types.ts + #!/bin/bash + set -e + if which typeshare > /dev/null ; then + typeshare . --lang=typescript --output-file=./inspectify/ui/src/lib/types.ts + else + echo "typeshare not run. to run install with 'cargo binstall typeshare-cli'" + fi build-wasm: cd inspectify/wasm; wasm-pack build --release --target bundler diff --git a/inspectify/ui/src/lib/types.ts b/inspectify/ui/src/lib/types.ts index 43956d4d..27b9cc26 100644 --- a/inspectify/ui/src/lib/types.ts +++ b/inspectify/ui/src/lib/types.ts @@ -4,12 +4,6 @@ export type Markdown = string; -export interface Sample { - input_json: unknown; - input_markdown: Markdown; - output_markdown: Markdown; -} - export interface AnalysisRequest { analysis: Analysis; src: string; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 0b35ff93..5062b29f 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -35,7 +35,7 @@ async fn run() -> Result<()> { - name: Install just and typeshare uses: taiki-e/install-action@v2 with: - tool: just,typeshare-cli + tool: just - name: Install wasm-pack uses: jetli/wasm-pack-action@v0.4.0 with: