Merge pull request #575 from ibuclaw/merge_stable

merge stable
dlang · May 9, 2024 · c3b8d4e · c3b8d4e
2 parents c9177c8 + a78f43b
commit c3b8d4e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 78 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
diff --git a/.github/workflows/build_release_template.yml b/.github/workflows/build_release_template.yml
@@ -131,7 +131,7 @@ jobs:
           - os: windows-2019
             target: windows
           # FreeBSD is built on an additional VM
-          - os: macos-12
+          - os: ubuntu-latest
             target: freebsd
 
     steps:
@@ -266,11 +266,12 @@ jobs:
       #
       - name: Run build_all.d for FreeBSD in a dedicated VM
         if: matrix.target == 'freebsd'
-        uses: cross-platform-actions/action@v0.22.0
+        uses: cross-platform-actions/action@v0.23.0
         with:
           operating_system: freebsd
           hypervisor: qemu
-          memory: 8G
+          memory: 12G
+          cpu_count: 4
           version: '13.2'
           shell: bash
           run: |

diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml
@@ -38,7 +38,7 @@ jobs:
           - host: ubuntu-latest
             os: linux
             build: dmd.${{ github.base_ref || github.ref_name }}.linux.tar.xz
-          - host: macos-12
+          - host: ubuntu-latest
             os: freebsd
             build: dmd.${{ github.base_ref || github.ref_name }}.freebsd-64.tar.xz
 
@@ -68,11 +68,12 @@ jobs:
 
       - name: Check ${{ matrix.os }} artifacts in a VM
         if: ${{ matrix.os == 'freebsd' }}
-        uses: cross-platform-actions/action@v0.21.1
+        uses: cross-platform-actions/action@v0.23.0
         with:
           operating_system: freebsd
           hypervisor: qemu
-          memory: 8G
+          memory: 12G
+          cpu_count: 4
           version: '12.2'
           environment_variables: OS BUILD
           shell: bash

diff --git a/create_dmd_release/build_all.d b/create_dmd_release/build_all.d
@@ -577,7 +577,6 @@ int main(string[] args)
     enum optlink = "optlink.zip";
     enum libC = "snn.lib";
     enum libCurl = "libcurl-7.68.0-WinSSL-zlib-x86-x64.zip";
-    enum omflibs = "omflibs-winsdk-10.0.16299.15.zip";
     enum mingwtag = "mingw-libs-8.0.0";
     enum mingwlibs = mingwtag ~ ".zip";               enum mingw_sha = hexString!"8c1619234ca8370b742a08a30b13bf9bdb333f842ed0ea02cafe9054c68adc97";
     enum lld = "lld-link-9.0.0-seh.zip";              enum lld_sha   = hexString!"ffde2eb0e0410e6985bbbb44c200b21a2b2dd34d3f8c3411f5ca5beb7f67ba5b";
@@ -603,7 +602,6 @@ int main(string[] args)
         fetchFile("http://ftp.digitalmars.com/"~optlink, cacheDir~"/"~optlink);
         fetchFile("http://ftp.digitalmars.com/"~libC, cacheDir~"/"~libC);
         fetchFile("https://downloads.dlang.org/other/"~libCurl, cacheDir~"/"~libCurl, verifySignature);
-        fetchFile("https://downloads.dlang.org/other/"~omflibs, cacheDir~"/"~omflibs, verifySignature);
         fetchFile("https://downloads.dlang.org/other/"~lld, cacheDir~"/"~lld, verifySignature, lld_sha);
         fetchFile("https://downloads.dlang.org/other/"~lld64, cacheDir~"/"~lld64, verifySignature, lld64_sha);
         fetchFile("https://github.com/dlang/installer/releases/download/"~mingwtag~"/"~mingwlibs, cacheDir~"/"~mingwlibs, verifySignature, mingw_sha);
@@ -638,8 +636,6 @@ int main(string[] args)
         copyFile(cacheDir~"/"~libC, workDir~"/windows/extraBins/dmd2/windows/lib/"~libC);
         // add libcurl build for windows
         extract(cacheDir~"/"~libCurl, workDir~"/windows/extraBins/");
-        // add updated OMF import libraries
-        extract(cacheDir~"/"~omflibs, workDir~"/windows/extraBins/dmd2/windows/lib/");
         // add mingw coff libraries
         extract(cacheDir~"/"~mingwlibs, workDir~"/windows/extraBins/");
         // add lld linker

diff --git a/create_dmd_release/create_dmd_release.d b/create_dmd_release/create_dmd_release.d
@@ -373,23 +373,6 @@ void buildAll(Bits bits, string branch)
     changeDir(cloneDir~"/phobos");
     run(msvcVars~makecmd~pic);
 
-    version(Windows) if (is32)
-    {
-        const makecmd_omf = makecmd.replace(makeModel, " MODEL=32omf");
-
-        info("Building Druntime 32omf");
-        changeDir(cloneDir~"/dmd/druntime");
-        run(makecmd_omf);
-
-        info("Building OMF import libraries");
-        changeDir(cloneDir~"/dmd/druntime/def");
-        run(make~jobs);
-
-        info("Building Phobos 32omf");
-        changeDir(cloneDir~"/phobos");
-        run(makecmd_omf);
-    }
-
     // Build docs
     if(!skipDocs)
     {
@@ -497,9 +480,6 @@ void createRelease(string branch)
         if(do32Bit)
         {
             copyFile(cloneDir~"/phobos/phobos32mscoff.lib", osDir~"/lib32mscoff/phobos32mscoff.lib");
-            // OMF:
-            copyFile(cloneDir~"/phobos/phobos.lib", osDir~"/lib/phobos.lib");
-            copyDir(cloneDir~"/dmd/druntime/def/", osDir~"/lib/", file => file.endsWith(".lib"));
         }
         if(do64Bit)
         {

diff --git a/test/release/validate_release.sh b/test/release/validate_release.sh
@@ -17,7 +17,7 @@ if [ "$OS" == "windows" ]
 then
 	7z x -y $BUILD -o"$GEN/"
 
-	TARGETS="-m32 -m32mscoff -m32omf -m64"
+	TARGETS="-m32 -m32mscoff -m64"
 	EXE=".exe"
 else
 	tar xf $BUILD --directory="$GEN/"