fixup! Try

jacob-carlborg · Jul 2, 2023 · 68f57be · 68f57be
1 parent e54c485
commit 68f57be
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,23 +35,22 @@ jobs:
               target_triple: x86_64-alpine-linux-musl
             docker: true
 
-          # - os:
-          #     host: macOS-latest
-          #     target_triple: x86_64-apple-macos10.9
-          #
-          # - os:
-          #     host: windows-latest
-          #     target_triple: x86_64-pc-windows-msvc
-          #
-          # - os:
-          #     target: freebsd
-          #     version: '13.1'
-          #     target_triple: x86_64-unknown-freebsd13.1
-          #     host: macOS-latest
-          #   cross_platform_actions: true
+          - os:
+              host: macOS-latest
+              target_triple: x86_64-apple-macos10.9
+
+          - os:
+              host: windows-latest
+              target_triple: x86_64-pc-windows-msvc
+
+          - os:
+              target: freebsd
+              version: '13.1'
+              target_triple: x86_64-unknown-freebsd13.1
+              host: macOS-latest
+            cross_platform_actions: true
 
         compiler:
-          - dmd-latest
           - ldc-latest
 
         llvm:
@@ -61,11 +60,10 @@ jobs:
           - compiler: dmd-beta
             llvm: '15.0.7'
             arch: x86_64
-            docker: true
             data:
               os:
-                host: ubuntu-latest
-                target_triple: x86_64-alpine-linux-musl
+                host: macOS-latest
+                target_triple: x86_64-apple-macos10.9
 
           - compiler: ldc-beta
             llvm: '15.0.7'
@@ -80,11 +78,10 @@ jobs:
             llvm: '15.0.7'
             arch: x86_64
             nightly: nightly
-            docker: true
             data:
               os:
-                host: ubuntu-latest
-                target_triple: x86_64-alpine-linux-musl
+                host: macOS-latest
+                target_triple: x86_64-apple-macos10.9
 
           - compiler: ldc-master
             llvm: '15.0.7'
@@ -93,8 +90,8 @@ jobs:
             docker: true
             data:
               os:
-                host: ubuntu-latest
-                target_triple: x86_64-alpine-linux-musl
+                host: macOS-latest
+                target_triple: x86_64-apple-macos10.9
 
     steps:
       - name: Clone Repository
@@ -160,4 +157,5 @@ jobs:
             -e DSTEP_LLVM_VERSION=${{ env.DSTEP_LLVM_VERSION }} \
             --platform linux/${{ matrix.docker_arch || matrix.arch }} \
             alpine:edge \
-            apk add --no-cache git curl bash && ./ci.sh
+            apk add --no-cache git curl bash && \
+            ./ci.sh
diff --git a/ci.sh b/ci.sh
@@ -12,7 +12,6 @@ d_compiler() {
 run() {
   source $(curl --retry 3 -fsS https://dlang.org/install.sh | bash -s "$(d_compiler)" -a)
   ./configure --llvm-path "llvm-$DSTEP_LLVM_VERSION" --statically-link-clang
-  cat linker_flags.txt
   dub test --verror
 }
 

diff --git a/test.d b/test.d
@@ -99,7 +99,7 @@ void executeCommand(const string[] args ...)
 
 string[] dubShellCommand(string[] subCommands ...)
 {
-    return (["dub", "--verror", "-v"] ~ subCommands ~ dubArch)
+    return (["dub", "--verror"] ~ subCommands ~ dubArch)
         .filter!(e => e.length > 0)
         .array;
 }