fixup! Try

jacob-carlborg · Jul 2, 2023 · dbbd0be · dbbd0be
1 parent 588754c
commit dbbd0be
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 51 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,67 +30,67 @@ jobs:
       matrix:
         arch: [x86_64]
         data:
-          # - os:
-          #     host: ubuntu-latest
-          #     target_triple: x86_64-alpine-linux-musl
-          #   docker: true
+          - os:
+              host: ubuntu-latest
+              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: 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:
           - ldc-latest
 
         llvm:
           - '15.0.7'
 
-        # include:
-        #   - compiler: dmd-beta
-        #     llvm: '15.0.7'
-        #     arch: x86_64
-        #     data:
-        #       os:
-        #         host: macOS-latest
-        #         target_triple: x86_64-apple-macos10.9
-        #
-        #   - compiler: ldc-beta
-        #     llvm: '15.0.7'
-        #     arch: x86_64
-        #     data:
-        #       os:
-        #         host: ubuntu-latest
-        #         target_triple: x86_64-alpine-linux-musl
-        #       docker: true
-        #
-        #   - compiler: dmd-master
-        #     llvm: '15.0.7'
-        #     arch: x86_64
-        #     nightly: nightly
-        #     data:
-        #       os:
-        #         host: macOS-latest
-        #         target_triple: x86_64-apple-macos10.9
-        #
-        #   - compiler: ldc-master
-        #     llvm: '15.0.7'
-        #     arch: x86_64
-        #     nightly: nightly
-        #     data:
-        #       os:
-        #         host: macOS-latest
-        #         target_triple: x86_64-apple-macos10.9
+        include:
+          - compiler: dmd-beta
+            llvm: '15.0.7'
+            arch: x86_64
+            data:
+              os:
+                host: macOS-latest
+                target_triple: x86_64-apple-macos10.9
+
+          - compiler: ldc-beta
+            llvm: '15.0.7'
+            arch: x86_64
+            data:
+              os:
+                host: ubuntu-latest
+                target_triple: x86_64-alpine-linux-musl
+              docker: true
+
+          - compiler: dmd-master
+            llvm: '15.0.7'
+            arch: x86_64
+            nightly: nightly
+            data:
+              os:
+                host: macOS-latest
+                target_triple: x86_64-apple-macos10.9
+
+          - compiler: ldc-master
+            llvm: '15.0.7'
+            arch: x86_64
+            nightly: nightly
+            data:
+              os:
+                host: macOS-latest
+                target_triple: x86_64-apple-macos10.9
 
     steps:
       - name: Clone Repository

diff --git a/ci.sh b/ci.sh
@@ -2,6 +2,10 @@
 
 set -exo pipefail
 
+download() {
+  curl --retry 3 -fsS "$1"
+}
+
 d_compiler() {
   echo "$DSTEP_COMPILER" | \
     sed 's/-latest//' | \
@@ -10,8 +14,8 @@ d_compiler() {
 }
 
 install_d_compiler() {
-  curl https://dlang.org/d-security.asc | gpg --import /dev/stdin
-  source $(curl --retry 3 -fsS https://dlang.org/install.sh | bash -s "$(d_compiler)" -a)
+  download https://dlang.org/d-keyring.gpg | gpg --import /dev/stdin
+  source $(download https://dlang.org/install.sh | bash -s "$(d_compiler)" -a)
 }
 
 run() {