Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/workflows/actions/quarto-dev/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@ runs:
restore-keys: |
${{ runner.os }}-deno_std-2-

- name: Cache Cargo dependencies
uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
package/typst-gather/target
key: ${{ runner.os }}-cargo-typst-gather-${{ hashFiles('package/typst-gather/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-typst-gather-

- name: Configure Quarto (.sh)
if: runner.os != 'Windows'
shell: bash
Expand Down
5 changes: 0 additions & 5 deletions configure.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@ IF EXIST !QUARTO_BIN_PATH!\quarto.cmd (
ECHO NOTE: To use quarto please use quarto.cmd (located in this folder) or add the following path to your PATH
ECHO !QUARTO_BIN_PATH!

REM Build typst-gather and install to tools directory
ECHO Building typst-gather...
cargo build --release --manifest-path package\typst-gather\Cargo.toml
COPY package\typst-gather\target\release\typst-gather.exe "!QUARTO_BIN_PATH!\tools\x86_64\"

endlocal & set QUARTO_BIN_DEV=%QUARTO_BIN_PATH%

GOTO :eof
5 changes: 0 additions & 5 deletions configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,3 @@ else
export QUARTO_DENO_EXTRA_OPTIONS="--reload"
quarto --version
fi

# Build typst-gather and install to tools directory
echo "Building typst-gather..."
cargo build --release --manifest-path package/typst-gather/Cargo.toml
cp package/typst-gather/target/release/typst-gather "$QUARTO_BIN_PATH/tools/$DENO_ARCH_DIR/"
1 change: 0 additions & 1 deletion package/src/common/dependencies/typst-gather.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export function typstGather(version: string): Dependency {
name: "typst-gather",
bucket: "typst-gather",
version,
archiveOnly: true,
architectureDependencies: {
"x86_64": {
"windows": typstGatherRelease("typst-gather-x86_64-pc-windows-msvc.zip"),
Expand Down
26 changes: 0 additions & 26 deletions package/src/common/prepare-dist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,32 +100,6 @@ export async function prepareDist(
}
}

// Stage typst-gather binary (built by configure.sh)
// Only stage if the build machine architecture matches the target architecture
// (cross-compilation is not currently supported)
const buildArch = Deno.build.arch === "aarch64" ? "aarch64" : "x86_64";
if (buildArch === config.arch) {
const typstGatherBinaryName = config.os === "windows" ? "typst-gather.exe" : "typst-gather";
const typstGatherSrc = join(
config.directoryInfo.root,
"package/typst-gather/target/release",
typstGatherBinaryName,
);
if (!existsSync(typstGatherSrc)) {
throw new Error(
`typst-gather binary not found at ${typstGatherSrc}\n` +
"Run ./configure.sh to build it.",
);
}
info("\nStaging typst-gather binary");
const typstGatherDest = join(targetDir, config.arch, typstGatherBinaryName);
ensureDirSync(join(targetDir, config.arch));
copySync(typstGatherSrc, typstGatherDest, { overwrite: true });
info(`Copied ${typstGatherSrc} to ${typstGatherDest}`);
} else {
info(`\nNote: Skipping typst-gather staging (build arch ${buildArch} != target arch ${config.arch})`);
}

// build quarto-preview.js
info("Building Quarto Web UI");
const result = buildQuartoPreviewJs(config.directoryInfo.src, undefined, true);
Expand Down
1 change: 0 additions & 1 deletion package/typst-gather/.gitignore

This file was deleted.

Loading