Skip to content

Commit 6ffc305

Browse files
committed
Merge branch 'main' into msrv-1.91
2 parents a10097a + 33cef6b commit 6ffc305

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

.github/workflows/test.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -828,9 +828,29 @@ jobs:
828828
container: "alpine:edge",
829829
},
830830
]
831-
container: ${{ matrix.metadata.container }}
831+
container:
832+
image: ${{ matrix.metadata.container }}
833+
volumes:
834+
- /usr/local:/host/usr/local
832835
steps:
833836
- uses: actions/checkout@v6
837+
- name: Show disk capacity
838+
if: startsWith(matrix.metadata.build, 'linux')
839+
run: df -h
840+
# Saves ~21 GiB
841+
- name: Clean up disk space (container)
842+
run: |
843+
rm -rf /__t/*
844+
rm -rf /host/usr/local/.ghcup
845+
rm -rf /host/usr/local/lib/android
846+
if: startsWith(matrix.metadata.build, 'linux') && matrix.metadata.container != ''
847+
# Saves ~16 GiB
848+
- name: Clean up disk space (native)
849+
run: |
850+
sudo rm -rf /__t/*
851+
sudo rm -rf /usr/local/.ghcup
852+
sudo rm -rf /usr/local/lib/android
853+
if: startsWith(matrix.metadata.build, 'linux') && matrix.metadata.container == ''
834854
- name: Show disk capacity
835855
if: startsWith(matrix.metadata.build, 'linux')
836856
run: df -h
@@ -909,8 +929,6 @@ jobs:
909929
EOF
910930
if: matrix.metadata.target
911931
- name: Cache
912-
# TODO: fix disk space issue for a couple of Linux runners
913-
if: ${{ !(matrix.stage.make == 'test-stage-5-test-examples' && (matrix.metadata.build == 'linux-musl' || matrix.metadata.build == 'linux-x64')) }}
914932
# TODO: v3 is unable to Restore the cache for some reason
915933
uses: whywaita/actions-cache-s3@v2
916934
with:

lib/compiler-cranelift/src/config.rs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,8 @@ impl Cranelift {
224224
.expect("should be a valid flag");
225225

226226
// Invert cranelift's default-on verification to instead default off.
227-
let enable_verifier = if self.enable_verifier {
228-
"true"
229-
} else {
230-
"false"
231-
};
232227
flags
233-
.set("enable_verifier", enable_verifier)
228+
.set("enable_verifier", &self.enable_verifier.to_string())
234229
.expect("should be valid flag");
235230

236231
flags
@@ -244,13 +239,11 @@ impl Cranelift {
244239
)
245240
.expect("should be valid flag");
246241

247-
let enable_nan_canonicalization = if self.enable_nan_canonicalization {
248-
"true"
249-
} else {
250-
"false"
251-
};
252242
flags
253-
.set("enable_nan_canonicalization", enable_nan_canonicalization)
243+
.set(
244+
"enable_nan_canonicalization",
245+
&self.enable_nan_canonicalization.to_string(),
246+
)
254247
.expect("should be valid flag");
255248

256249
settings::Flags::new(flags)

lib/compiler-llvm/src/config.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -264,14 +264,6 @@ impl LLVM {
264264
machine_code: true,
265265
})
266266
}
267-
// Architecture::Arm(_) => InkwellTarget::initialize_arm(&InitializationConfig {
268-
// asm_parser: true,
269-
// asm_printer: true,
270-
// base: true,
271-
// disassembler: true,
272-
// info: true,
273-
// machine_code: true,
274-
// }),
275267
_ => unimplemented!("target {} not yet supported in Wasmer", triple),
276268
}
277269

0 commit comments

Comments
 (0)