Skip to content

Commit adc3630

Browse files
authored
version upgrades (#5)
1 parent 7d9efc5 commit adc3630

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# == base ======================
22
FROM buildpack-deps:bookworm AS base
3+
ENV CACHEBUST=2024-09-06
34
RUN apt update
45

56
# Rust envvars
67
ENV RUSTUP_HOME=/usr/local/rustup \
78
CARGO_HOME=/usr/local/cargo \
89
PATH=/usr/local/cargo/bin:$PATH \
9-
RUST_VERSION=1.77.0
10+
RUST_VERSION=1.81.0
1011

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

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

9496
# == general-cli =================
9597
FROM base AS general-cli

tests/data-manip.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ dataManipTools.forEach(binaryOnPathTest);
1010

1111
binaryVersionTest({
1212
binary: "duckdb",
13-
semver: "^0.10.1",
13+
semver: "^1",
1414
extract: /^v(.*) [0-9a-f]*$/,
1515
});

tests/dataloader-languages.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { binaryVersionTest } from "./index.ts";
22

33
const dataLoaderLanguages = [
4-
{ binary: "node", semver: "^20" },
4+
{ binary: "node", semver: "^20.17" },
55
{ binary: "npm", semver: "^10.5" },
66
{ binary: "yarn", semver: "^1.22" },
77
{
@@ -11,18 +11,18 @@ const dataLoaderLanguages = [
1111
},
1212
{
1313
binary: "Rscript",
14-
semver: "^4.3",
14+
semver: "^4.4.1",
1515
extract: /^Rscript \(R\) version ([^\s]+)/,
1616
},
1717
{
1818
name: "Rust",
1919
binary: "cargo",
20-
semver: "^1.77",
20+
semver: "^1.81",
2121
extract: /^cargo ([\d.]+)/,
2222
},
2323
{
2424
binary: "rust-script",
25-
semver: "^0.34",
25+
semver: "^0.35",
2626
prefix: "rust-script",
2727
},
2828
{

0 commit comments

Comments
 (0)