Merge remote-tracking branch 'upstream/master' into stable

dlang · Jan 1, 2024 · c0261b7 · c0261b7
2 parents efe3deb + 27d7e42
commit c0261b7
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 185 deletions.
diff --git a/.github/workflows/build_release_template.yml b/.github/workflows/build_release_template.yml
@@ -85,7 +85,7 @@ jobs:
           N=$(( 2 * $(nproc) ))
 
           # Build minimal host compiler (sometimes not triggered by dlang.org/posix.mak)
-          make -f posix.mak -j$N -C dmd/druntime
+          make -j$N -C dmd
 
           # Build docs and include the man pages
           make -f posix.mak -j$N -C dlang.org release
@@ -266,15 +266,18 @@ jobs:
       #
       - name: Run build_all.d for FreeBSD in a dedicated VM
         if: matrix.target == 'freebsd'
-        uses: vmactions/freebsd-vm@v0.2.9
+        uses: cross-platform-actions/action@v0.21.1
         with:
-          usesh: true
-          # Need more RAM than the default 1G
-          mem: 4096
-          prepare: pkg install -y bash curl curlpp git gmake pkgconf gnupg rsync llvm90
+          operating_system: freebsd
+          hypervisor: qemu
+          memory: 8G
+          version: '12.2'
+          shell: bash
           run: |
             set -eux
 
+            sudo pkg install -y curl curlpp git gmake pkgconf gnupg rsync llvm
+
             # Import key used to sign binaries
             curl https://dlang.org/d-keyring.gpg -o d-keyring.gpg
             gpg d-keyring.gpg

diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml
@@ -6,8 +6,6 @@ name: test_release
 on:
   pull_request:
   push:
-    branches:
-      - master
 
 jobs:
   build_release:
@@ -70,10 +68,12 @@ jobs:
 
       - name: Check ${{ matrix.os }} artifacts in a VM
         if: ${{ matrix.os == 'freebsd' }}
-        uses: cross-platform-actions/action@v0.6.2
+        uses: cross-platform-actions/action@v0.21.1
         with:
           operating_system: freebsd
-          version: 12.2
+          hypervisor: qemu
+          memory: 8G
+          version: '12.2'
           environment_variables: OS BUILD
           shell: bash
           run: source ./installer/test/release/validate_release.sh

diff --git a/create_dmd_release/build_all.d b/create_dmd_release/build_all.d
@@ -459,7 +459,7 @@ void cloneSources(string gitTag, string dubTag, bool isBranch, bool skipDocs, st
             run(fmt.format(gitTag, proj));
     }
     enforce(nfallback < allProjects.length, "Branch " ~ gitTag ~ " not found in any dlang repo.");
-    run(fmt.format(dubTag, "dub"));
+    run(fmt.format(isBranch && !branchExists(prefix ~ "dub", dubTag) ? "master" : dubTag, "dub"));
 }
 
 bool branchExists(string gitRepo, string branch)