Skip to content

Commit 750794d

Browse files
Yohe-AmYohe-Am
committed
fix: go back to rust-toolcain
1 parent a0467f4 commit 750794d

File tree

7 files changed

+20
-63
lines changed

7 files changed

+20
-63
lines changed

‎.ghjk/lock.json

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,6 @@
969969
"installs": [
970970
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
971971
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
972-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
973972
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
974973
],
975974
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
@@ -987,7 +986,6 @@
987986
"bciqaxe7vwem6uxfytyohs6kqpupnbuhyoyzeedzl4likzy6jcr56ijq",
988987
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
989988
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
990-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
991989
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy",
992990
"bciqfowj6nqpowepljt5iwqtvirrcplha6uua2rnqjpfruwaubtx2dyq",
993991
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
@@ -1007,7 +1005,6 @@
10071005
"bciqpek3ekbnicaqsmhr7ys4bxbfnnpjgheccyzkycrpknymdbttdxqq",
10081006
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
10091007
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1010-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
10111008
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy",
10121009
"bciqkrchhl6s7ukk65kmxzy2hj4itz7vdzkw6wygj2zgm6euiqsty27q",
10131010
"bciqg46g2klmy73lwplnbk2vxc3dtdr5n4wnbqmenlom7qudgc6sqi4i",
@@ -1025,7 +1022,6 @@
10251022
"bciqaxe7vwem6uxfytyohs6kqpupnbuhyoyzeedzl4likzy6jcr56ijq",
10261023
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
10271024
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1028-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
10291025
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy",
10301026
"bciqfowj6nqpowepljt5iwqtvirrcplha6uua2rnqjpfruwaubtx2dyq",
10311027
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
@@ -1073,7 +1069,6 @@
10731069
"bciqjya43j2x2y2t6ejepm63dipaueztkem7xjmg6hd4m32fu52i7oii",
10741070
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
10751071
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1076-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
10771072
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
10781073
],
10791074
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
@@ -1102,7 +1097,6 @@
11021097
"installs": [
11031098
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
11041099
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1105-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
11061100
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy",
11071101
"bciqfucbwalyi57qdo3yyscpy72pbjc2frjhd56ibnne3ocmuabiq56a",
11081102
"bciqe4reyqmdatxmfbejk6gt7iv4qpoamcw4iteytbe4qy5urljdn25i",
@@ -1117,7 +1111,6 @@
11171111
"installs": [
11181112
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
11191113
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1120-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
11211114
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy",
11221115
"bciqfucbwalyi57qdo3yyscpy72pbjc2frjhd56ibnne3ocmuabiq56a",
11231116
"bciqe4reyqmdatxmfbejk6gt7iv4qpoamcw4iteytbe4qy5urljdn25i",
@@ -1132,7 +1125,6 @@
11321125
"installs": [
11331126
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
11341127
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1135-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
11361128
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy",
11371129
"bciqfowj6nqpowepljt5iwqtvirrcplha6uua2rnqjpfruwaubtx2dyq",
11381130
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
@@ -1144,7 +1136,6 @@
11441136
"installs": [
11451137
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
11461138
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1147-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
11481139
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy"
11491140
],
11501141
"allowedBuildDeps": "bciqdupzy2f22tzsuaxioi6v6ztbqcah36x2hdobd7p62zdbgt7zy4ry"
@@ -1153,7 +1144,6 @@
11531144
"installs": [
11541145
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
11551146
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1156-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
11571147
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy",
11581148
"bciqfucbwalyi57qdo3yyscpy72pbjc2frjhd56ibnne3ocmuabiq56a",
11591149
"bciqe4reyqmdatxmfbejk6gt7iv4qpoamcw4iteytbe4qy5urljdn25i",
@@ -1165,7 +1155,6 @@
11651155
"installs": [
11661156
"bciqhfkolloo5pjl4nuajaietd3xu34yvawlwyh7htzp555fwjcdcf2y",
11671157
"bciqhkiowztt3hbtppbofilrqjwy2q62hibqo6aumjhyusja4lz3sgha",
1168-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq",
11691158
"bciqeeq3eemjizam22vcgnviqdoovwpxof6rjjy6oagkojmnozerwoqy",
11701159
"bciqfowj6nqpowepljt5iwqtvirrcplha6uua2rnqjpfruwaubtx2dyq",
11711160
"bciqe6xh7wno7lxaefo7qpjl4upzfdp4x5rqia7wrlvjxbdbjalt7ina",
@@ -2657,48 +2646,6 @@
26572646
},
26582647
"packageName": "cmake"
26592648
},
2660-
"bciqfkhe7jpik6xkyv76cmoaawuwnahi2xfmr64efqvdtqk5v53ormnq": {
2661-
"version": "1.85.0",
2662-
"port": {
2663-
"ty": "denoWorker@v1",
2664-
"name": "rust_rustup",
2665-
"platforms": [
2666-
"x86_64-linux",
2667-
"aarch64-linux",
2668-
"x86_64-darwin",
2669-
"aarch64-darwin",
2670-
"x86_64-windows",
2671-
"aarch64-windows",
2672-
"x86_64-freebsd",
2673-
"aarch64-freebsd",
2674-
"x86_64-netbsd",
2675-
"aarch64-netbsd",
2676-
"x86_64-aix",
2677-
"aarch64-aix",
2678-
"x86_64-solaris",
2679-
"aarch64-solaris",
2680-
"x86_64-illumos",
2681-
"aarch64-illumos",
2682-
"x86_64-android",
2683-
"aarch64-android"
2684-
],
2685-
"version": "0.1.0",
2686-
"buildDeps": [
2687-
{
2688-
"name": "rustup_rustlang"
2689-
}
2690-
],
2691-
"moduleSpecifier": "https://raw.githubusercontent.com/metatypedev/ghjk/a518e49ffe637f1596cb1a4f8686abd77f6e2348/ports/rust.ts"
2692-
},
2693-
"profile": "default",
2694-
"components": [
2695-
"rust-src"
2696-
],
2697-
"targets": [
2698-
"wasm32-unknown-unknown",
2699-
"wasm32-wasip1"
2700-
]
2701-
},
27022649
"bciqpek3ekbnicaqsmhr7ys4bxbfnnpjgheccyzkycrpknymdbttdxqq": {
27032650
"version": "v2.4.0",
27042651
"port": {

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ jobs:
8989
# target: x86_64-unknown-linux-musl
9090
# suffix: ""
9191
# cross: false
92-
- os: ubuntu-22.04
92+
- os: ubuntu-22.04-arm
9393
target: aarch64-unknown-linux-gnu
9494
suffix: ""
95-
cross: true
95+
cross: false
9696
steps:
9797
- uses: actions/checkout@v4
9898
with:
@@ -137,7 +137,6 @@ jobs:
137137
cd target/${{ matrix.target }}/release/
138138
tar czvf ../../../meta-cli-thin-${{ steps.latest-tag.outputs.tag }}-${{ matrix.target }}.tar.gz "meta${{ matrix.suffix }}"
139139
cd ../../../
140-
# fat meta-cli is not avail for arm64 linux (waiting on arm64 linux machines for Gh CI)
141140
- if: ${{ matrix.cross != true }}
142141
uses: svenstaro/upload-release-action@v2
143142
with:
@@ -171,6 +170,7 @@ jobs:
171170
fetch-depth: 0
172171
- uses: WyriHaximus/[email protected]
173172
id: latest-tag
173+
- uses: dsherret/rust-toolchain-file@v1
174174
- uses: mozilla-actions/[email protected]
175175

176176
- uses: metatypedev/setup-ghjk@b4ab7287a841fd5f8a4117f3efc14131c7ec62e1

‎.github/workflows/tests.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ jobs:
8383
runs-on: ubuntu-22.04
8484
steps:
8585
- uses: actions/checkout@v4
86+
- uses: dsherret/rust-toolchain-file@v1
8687
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
8788
name: Setup sccache secrets
8889
run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
8990
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
90-
uses: mozilla-actions/[email protected].7
91+
uses: mozilla-actions/[email protected].9
9192

9293
- uses: metatypedev/setup-ghjk@b4ab7287a841fd5f8a4117f3efc14131c7ec62e1
9394
- run: |
@@ -128,11 +129,12 @@ jobs:
128129
# activate: '.venv\Scripts\activate.bat'
129130
steps:
130131
- uses: actions/checkout@v4
132+
- uses: dsherret/rust-toolchain-file@v1
131133
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
132134
name: Setup sccache secrets
133135
run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
134136
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
135-
uses: mozilla-actions/[email protected].7
137+
uses: mozilla-actions/[email protected].9
136138

137139
- uses: metatypedev/setup-ghjk@b4ab7287a841fd5f8a4117f3efc14131c7ec62e1
138140
with:
@@ -245,11 +247,12 @@ jobs:
245247
uses: mxschmitt/action-tmate@v3
246248
with:
247249
detached: true
250+
- uses: dsherret/rust-toolchain-file@v1
248251
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
249252
name: Setup sccache secrets
250253
run: echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
251254
- if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
252-
uses: mozilla-actions/[email protected].7
255+
uses: mozilla-actions/[email protected].9
253256
# - name: Cache deno dir
254257
# uses: actions/cache@v4
255258
# with:

‎ghjk.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ env("_rust").install(
4545
// locked: true,
4646
// version: "0.10.0"
4747
// }),
48-
installs.rust_stable,
48+
// FIXME: sccache doesn't like ghjk installed
49+
// rustc
50+
// installs.rust_stable,
4951
);
5052

5153
if (Deno.build.os == "linux" && !Deno.env.has("NO_MOLD")) {

‎rust-toolchain.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[toolchain]
2+
# this is currently tracking the version used by denoland/deno
3+
channel = "1.85.0"
4+
components = ["rustfmt", "clippy"]
5+
targets = ["wasm32-unknown-unknown", "wasm32-wasip1"]

‎tools/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG DISTROLESS_TAG=debug-nonroot
55

66
#
77
# must match distroless debian version
8-
FROM rust:${RUST_VERSION}-slim-bullseye AS base
8+
FROM rust:${RUST_VERSION}-slim-bookworm AS base
99

1010
WORKDIR /app
1111

@@ -104,7 +104,7 @@ RUN chmod +x /tini \
104104
&& ln -s /lib/x86_64-linux-gnu /lib/sym/amd64
105105

106106
#
107-
FROM gcr.io/distroless/cc-debian11:${DISTROLESS_TAG} AS prd
107+
FROM gcr.io/distroless/cc-debian12:${DISTROLESS_TAG} AS prd
108108

109109
SHELL ["/busybox/sh", "-c"]
110110

‎tools/consts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const TAGLINE =
1818
`Declarative API development platform. Build backend components with WASM, Typescript and Python, no matter where and how your (legacy) systems are.` as string;
1919

2020
export const sedLockLines: Record<string, [string | RegExp, string][]> = {
21-
// "rust-toolchain.toml": [[/(channel = ").+(")/, RUST_VERSION]],
21+
"rust-toolchain.toml": [[/(channel = ").+(")/, RUST_VERSION]],
2222
".github/**/*.yml": [
2323
['( GHJK_VERSION: ").+(")', GHJK_VERSION],
2424
[/([\s-]+uses:\s+metatypedev\/setup-ghjk@).+()/, GHJK_ACTION_VERSION],

0 commit comments

Comments
 (0)