Skip to content

Commit 454080f

Browse files
Insert some debugging
1 parent 653d4cb commit 454080f

2 files changed

Lines changed: 13 additions & 18 deletions

File tree

.github/workflows/main.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
pull_request:
66
push:
77
branches-ignore:
8-
- 'merge-*' # don't run on pushes to merge-X.Y.Z branches, they are usually PRs
8+
- "merge-*" # don't run on pushes to merge-X.Y.Z branches, they are usually PRs
99
tags: # explicitly needed to run for all tags, due to the branches filter above
10-
- '**'
10+
- "**"
1111

1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,7 +23,6 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
include:
26-
2726
- job_name: Linux x86_64 multilib
2827
os: ubuntu-22.04
2928
arch: x86_64
@@ -150,10 +149,10 @@ jobs:
150149
env:
151150
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.arch == 'arm64' && '11.0' || '10.12' }}
152151
steps:
153-
- name: 'Fix GitHub actions in Alpine aarch64 container'
152+
- name: "Fix GitHub actions in Alpine aarch64 container"
154153
if: startsWith(matrix.container_image, 'alpine') && matrix.arch == 'aarch64'
155154
uses: laverdet/alpine-arm64@v1
156-
- name: 'Set up Linux container'
155+
- name: "Set up Linux container"
157156
if: matrix.container_image
158157
run: |
159158
set -eux
@@ -174,8 +173,8 @@ jobs:
174173
# create ../llvm symlink to distro LLVM (no prebuilt LDC-LLVM for musl)
175174
ln -s /usr/lib/llvm21 $(dirname $(pwd))/llvm
176175
../llvm/bin/llvm-config --version
177-
# link wasm-ld into $PATH
178-
ln -sf $PWD/../llvm/bin/wasm-ld /usr/${{ matrix.arch }}-alpine-linux-musl/bin/wasm-ld
176+
which wasm-ld
177+
wasm-ld -v
179178
# see https://github.com/actions/runner/issues/801#issuecomment-2976165281
180179
if [[ '${{ matrix.arch }}' == aarch64 ]]; then
181180
sed -i "/^ID=/s/alpine/NotpineForGHA/" /etc/os-release
@@ -195,7 +194,7 @@ jobs:
195194
llvm_version: ${{ matrix.llvm_version || env.LLVM_VERSION }}
196195
clang_major: ${{ env.CLANG_MAJOR }}
197196
arch: ${{ matrix.arch }}
198-
- name: 'Ubuntu 22: Build recent gdb from source' # see https://github.com/ldc-developers/ldc/issues/4389
197+
- name: "Ubuntu 22: Build recent gdb from source" # see https://github.com/ldc-developers/ldc/issues/4389
199198
if: startsWith(matrix.os, 'ubuntu-22.04')
200199
uses: ./.github/actions/helper-build-gdb
201200
with:
@@ -241,7 +240,7 @@ jobs:
241240
uses: ./.github/actions/5-install
242241
with:
243242
arch: ${{ matrix.arch }}
244-
- name: 'macOS: Cross-compile iOS libraries, copy to install dir & extend ldc2.conf'
243+
- name: "macOS: Cross-compile iOS libraries, copy to install dir & extend ldc2.conf"
245244
if: runner.os == 'macOS'
246245
uses: ./.github/actions/5a-ios
247246
with:
@@ -253,7 +252,7 @@ jobs:
253252
uses: ./.github/actions/6-integration-test
254253
with:
255254
arch: ${{ matrix.arch }}
256-
- name: 'macOS: Run iOS cross-compilation integration test'
255+
- name: "macOS: Run iOS cross-compilation integration test"
257256
if: runner.os == 'macOS'
258257
run: |
259258
set -eux
@@ -274,15 +273,13 @@ jobs:
274273
arch: ${{ matrix.arch }}
275274
os: ${{ startsWith(matrix.container_image, 'alpine') && 'alpine' || '' }}
276275

277-
278276
# Cross-compilation jobs for non-native targets.
279277
# druntime/Phobos/LDC unittests aren't built; all test stages are skipped.
280278
build-cross:
281279
strategy:
282280
fail-fast: false
283281
matrix:
284282
include:
285-
286283
- job_name: Android armv7a
287284
host_os: ubuntu-22.04
288285
os: android
@@ -330,7 +327,7 @@ jobs:
330327
uses: ./.github/actions/5-install
331328
with:
332329
cross_compiling: true
333-
- name: 'Android: Cross-compile ${{ matrix.android_x86_arch }} libraries & copy to install dir'
330+
- name: "Android: Cross-compile ${{ matrix.android_x86_arch }} libraries & copy to install dir"
334331
if: matrix.os == 'android'
335332
uses: ./.github/actions/5a-android-x86
336333
with:
@@ -345,7 +342,6 @@ jobs:
345342
os: ${{ matrix.os }}
346343
cross_target_triple: ${{ env.CROSS_TRIPLE }}
347344

348-
349345
merge-macos:
350346
name: macOS universal
351347
runs-on: macos-latest
@@ -368,7 +364,6 @@ jobs:
368364
- name: Merge x64 & x86 packages to multilib one & build installer
369365
uses: ./.github/actions/merge-windows
370366

371-
372367
upload-to-github:
373368
name: Upload to GitHub
374369
if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master'

tests/codegen/wasi.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// REQUIRES: target_WebAssembly, link_WebAssembly
22

33
// emit textual IR *and* compile & link
4-
// RUN: %ldc -mtriple=wasm32-unknown-wasi -Xcc=-nostdlib -output-ll -output-o -of=%t.wasm %s
4+
// RUN: %ldc -mtriple=wasm32-unknown-wasi -Xcc=-v -Xcc=-nostdlib -output-ll -output-o -of=%t.wasm %s
55
// RUN: FileCheck %s < %t.ll
66
//
7-
// RUN: %ldc -mtriple=wasm32-unknown-wasip1 -Xcc=-nostdlib -output-ll -output-o -of=%t_p1.wasm %s
7+
// RUN: %ldc -mtriple=wasm32-unknown-wasip1 -Xcc=-v -Xcc=-nostdlib -output-ll -output-o -of=%t_p1.wasm %s
88
// RUN: FileCheck %s < %t_p1.ll
99
//
10-
// RUN: %ldc -mtriple=wasm32-unknown-wasip2 -Xcc=-nostdlib -output-ll -output-o -of=%t_p2.wasm %s
10+
// RUN: %ldc -mtriple=wasm32-unknown-wasip2 -Xcc=-v -Xcc=-nostdlib -output-ll -output-o -of=%t_p2.wasm %s
1111
// RUN: FileCheck %s < %t_p2.ll
1212

1313

0 commit comments

Comments
 (0)