Skip to content

Commit 0d892ff

Browse files
authored
Merge branch 'main' into bricksroo/html-rewriter-docs-fix
2 parents 91a4c73 + 9e9caea commit 0d892ff

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ jobs:
164164
- uses: actions/checkout@v4
165165
with:
166166
submodules: true
167-
- name: Install Rust 1.77.1
167+
- name: Install Rust 1.81.0
168168
run: |
169-
rustup toolchain install 1.77.1
170-
rustup target add wasm32-wasi --toolchain 1.77.1
169+
rustup toolchain install 1.81.0
170+
rustup target add wasm32-wasip1 --toolchain 1.81.0
171171
- name: Restore wasm-tools from cache
172172
uses: actions/cache@v3
173173
id: wasm-tools
@@ -193,10 +193,10 @@ jobs:
193193
- uses: actions/checkout@v4
194194
with:
195195
submodules: true
196-
- name: Install Rust 1.77.1
196+
- name: Install Rust 1.81.0
197197
run: |
198-
rustup toolchain install 1.77.1
199-
rustup target add wasm32-wasi --toolchain 1.77.1
198+
rustup toolchain install 1.81.0
199+
rustup target add wasm32-wasip1 --toolchain 1.81.0
200200
- name: Restore wasm-tools from cache
201201
uses: actions/cache@v3
202202
id: wasm-tools

.github/workflows/release-please.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ jobs:
8989
- uses: actions/checkout@v3
9090
with:
9191
submodules: true
92-
- name: Install Rust 1.77.1
92+
- name: Install Rust 1.81.0
9393
run: |
94-
rustup toolchain install 1.77.1
95-
rustup target add wasm32-wasi --toolchain 1.77.1
94+
rustup toolchain install 1.81.0
95+
rustup target add wasm32-wasi --toolchain 1.81.0
9696
- name: Restore wasm-tools from cache
9797
uses: actions/cache@v3
9898
id: wasm-tools

runtime/fastly/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
cmake_minimum_required(VERSION 3.27)
22

3+
#FIXME(1243)
4+
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/../rust-toolchain.toml" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/../StarlingMonkey")
5+
36
include("../StarlingMonkey/cmake/add_as_subproject.cmake")
47

58
add_builtin(

runtime/rust-toolchain.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "1.80.0"
3-
targets = [ "wasm32-wasip1" ]
2+
channel = "1.81.0"
3+
targets = ["wasm32-wasip"]
44
profile = "minimal"

0 commit comments

Comments
 (0)