Skip to content

Commit 31f6300

Browse files
committed
ci: use rust:1.89 image
1 parent fa8249b commit 31f6300

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

.fluentci/src/dagger/jobs.ts

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const test = async (src = ".", options: string[] = []) => {
1212
const context = await getDirectory(src);
1313
const ctr = dag
1414
.container()
15-
.from("rust:1.84-bullseye")
15+
.from("rust:1.89-bullseye")
1616
.withDirectory("/app", context, { exclude })
1717
.withWorkdir("/app")
1818
.withMountedCache("/app/target", dag.cacheVolume("target"))
@@ -27,7 +27,7 @@ export const build = async (src = ".") => {
2727
const context = await getDirectory(src);
2828
const ctr = dag
2929
.container()
30-
.from("rust:1.84-bullseye")
30+
.from("rust:1.89-bullseye")
3131
.withExec(["dpkg", "--add-architecture", "armhf"])
3232
.withExec(["dpkg", "--add-architecture", "arm64"])
3333
.withExec(["apt-get", "update"])
@@ -103,18 +103,18 @@ export const build = async (src = ".") => {
103103
.withEnvVariable("RUSTFLAGS", rustflags)
104104
.withEnvVariable(
105105
"PKG_CONFIG_ALLOW_CROSS",
106-
Deno.env.get("TARGET") !== "x86_64-unknown-linux-gnu" ? "1" : "0",
106+
Deno.env.get("TARGET") !== "x86_64-unknown-linux-gnu" ? "1" : "0"
107107
)
108108
.withEnvVariable(
109109
"C_INCLUDE_PATH",
110110
Deno.env.get("TARGET") !== "x86_64-unknown-linux-gnu"
111111
? "/build/sysroot/usr/include"
112-
: "/usr/include",
112+
: "/usr/include"
113113
)
114114
.withEnvVariable("TAG", Deno.env.get("TAG") || "latest")
115115
.withEnvVariable(
116116
"TARGET",
117-
Deno.env.get("TARGET") || "x86_64-unknown-linux-gnu",
117+
Deno.env.get("TARGET") || "x86_64-unknown-linux-gnu"
118118
)
119119
.withExec([
120120
"sh",
@@ -142,31 +142,29 @@ export const build = async (src = ".") => {
142142
]);
143143

144144
const exe = await ctr.file(
145-
`/app/tunein_${Deno.env.get("TAG")}_${Deno.env.get("TARGET")}.tar.gz`,
145+
`/app/tunein_${Deno.env.get("TAG")}_${Deno.env.get("TARGET")}.tar.gz`
146146
);
147147
await exe.export(
148-
`./tunein_${Deno.env.get("TAG")}_${Deno.env.get("TARGET")}.tar.gz`,
148+
`./tunein_${Deno.env.get("TAG")}_${Deno.env.get("TARGET")}.tar.gz`
149149
);
150150

151151
const sha = await ctr.file(
152-
`/app/tunein_${Deno.env.get("TAG")}_${
153-
Deno.env.get("TARGET")
154-
}.tar.gz.sha256`,
152+
`/app/tunein_${Deno.env.get("TAG")}_${Deno.env.get("TARGET")}.tar.gz.sha256`
155153
);
156154
await sha.export(
157-
`./tunein_${Deno.env.get("TAG")}_${Deno.env.get("TARGET")}.tar.gz.sha256`,
155+
`./tunein_${Deno.env.get("TAG")}_${Deno.env.get("TARGET")}.tar.gz.sha256`
158156
);
159157
return ctr.stdout();
160158
};
161159

162160
export type JobExec = (src?: string) =>
163161
| Promise<string>
164162
| ((
165-
src?: string,
166-
options?: {
167-
ignore: string[];
168-
},
169-
) => Promise<string>);
163+
src?: string,
164+
options?: {
165+
ignore: string[];
166+
}
167+
) => Promise<string>);
170168

171169
export const runnableJobs: Record<Job, JobExec> = {
172170
[Job.test]: test,

0 commit comments

Comments
 (0)