Skip to content

version upgrades #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2024
Merged

version upgrades #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# == base ======================
FROM buildpack-deps:bookworm AS base
ENV CACHEBUST=2024-09-06
RUN apt update

# Rust envvars
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=1.77.0
RUST_VERSION=1.81.0

# == node ======================
FROM base AS node
Expand Down Expand Up @@ -48,12 +49,13 @@ RUN --mount=type=cache,target=/var/cache/apt,id=framework-runtime-r \
FROM base AS duckdb
RUN cd $(mktemp -d); \
dpkgArch="$(dpkg --print-architecture)"; \
version=1.0.0; \
case "${dpkgArch##*-}" in \
amd64) duckdbArch='amd64' ;; \
arm64) duckdbArch='aarch64' ;; \
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
esac; \
wget https://github.com/duckdb/duckdb/releases/download/v0.10.1/duckdb_cli-linux-${duckdbArch}.zip; \
wget https://github.com/duckdb/duckdb/releases/download/v${version}/duckdb_cli-linux-${duckdbArch}.zip; \
unzip duckdb_cli-linux-${duckdbArch}.zip; \
install -m 0755 duckdb /usr/bin/duckdb;

Expand Down Expand Up @@ -89,7 +91,7 @@ RUN set -eux; \
# rust-script is what Framework uses to run Rust data loaders
RUN cargo binstall -y --force rust-script
# all the apache arrow-tools
RUN cargo binstall -y --force csv2arrow csv2parquet json2arrow json2parquet
RUN cargo binstall -y --force csv2arrow csv2parquet json2arrow json2parquet

# == general-cli =================
FROM base AS general-cli
Expand Down
2 changes: 1 addition & 1 deletion tests/data-manip.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ dataManipTools.forEach(binaryOnPathTest);

binaryVersionTest({
binary: "duckdb",
semver: "^0.10.1",
semver: "^1",
extract: /^v(.*) [0-9a-f]*$/,
});
8 changes: 4 additions & 4 deletions tests/dataloader-languages.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { binaryVersionTest } from "./index.ts";

const dataLoaderLanguages = [
{ binary: "node", semver: "^20" },
{ binary: "node", semver: "^20.17" },
{ binary: "npm", semver: "^10.5" },
{ binary: "yarn", semver: "^1.22" },
{
Expand All @@ -11,18 +11,18 @@ const dataLoaderLanguages = [
},
{
binary: "Rscript",
semver: "^4.3",
semver: "^4.4.1",
extract: /^Rscript \(R\) version ([^\s]+)/,
},
{
name: "Rust",
binary: "cargo",
semver: "^1.77",
semver: "^1.81",
extract: /^cargo ([\d.]+)/,
},
{
binary: "rust-script",
semver: "^0.34",
semver: "^0.35",
prefix: "rust-script",
},
{
Expand Down