Merge stable

.github/workflows/build_release_template.yml

@@ -51,21 +51,21 @@ jobs:
     steps:
       # Clone all required repos
       - name: Clone dmd
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'dlang/dmd'
           ref: ${{ inputs.release_branch }}
           path: 'dmd'
 
       - name: Clone phobos
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'dlang/phobos'
           ref: ${{ inputs.release_branch }}
           path: 'phobos'
 
       - name: Clone dlang.org
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'dlang/dlang.org'
           ref: ${{ inputs.release_branch }}
@@ -93,7 +93,7 @@ jobs:
 
       # Save the generated documentation for the target-specific builds
       - name: Upload generated docs as a temporary artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dmd-documentation
           path: dlang.org/web
@@ -126,7 +126,7 @@ jobs:
         include:
           - os: ubuntu-20.04
             target: linux
-          - os: macos-latest
+          - os: macos-12
             target: osx
           - os: windows-2019
             target: windows
@@ -192,7 +192,7 @@ jobs:
       # Clone dlang/installer which provides the actual build scripts
       #
       - name: Clone installer repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ inputs.installer_repo }}
           ref: ${{ inputs.installer_branch }}
@@ -201,7 +201,7 @@ jobs:
       # Load the generated documentation in the create_dmd_release folder
       #
       - name: Download docs generated by the previous job
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: dmd-documentation
           path: create_dmd_release/docs
@@ -306,9 +306,9 @@ jobs:
       # job(s) have access to all generated releases
       #
       - name: Upload generated release as a temporary artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: dmd-release
+          name: dmd-release-${{ matrix.target }}
           path: |
             ${{ github.workspace }}/create_dmd_release/build/*
             !${{ github.workspace }}/create_dmd_release/build/*.zip

.github/workflows/build_windows.yml

@@ -22,12 +22,12 @@ jobs:
       LLVM_VER: 9.0.0
       ARCH: ${{ matrix.arch }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - shell: cmd
         run: call windows\build_lld.bat || exit /b
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: lld-${{ matrix.arch }}
           path: artifacts/
@@ -42,12 +42,12 @@ jobs:
       MINGW_VER: 8.0.0
       D_VERSION: 2.077.1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - shell: cmd
         run: call windows\build_mingw.bat || exit /b
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: mingw-libs
           path: artifacts/
@@ -63,12 +63,12 @@ jobs:
       ZLIB_VER: 1.2.11
       PEXPORTS_VER: 0.47
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - shell: cmd
         run: call windows\build_curl.bat || exit /b
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: curl
           path: artifacts/
@@ -78,7 +78,7 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 120
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Clone repos
@@ -94,7 +94,7 @@ jobs:
           set -eux
           mkdir -p work/docs
           zip -r work/docs/docs.zip work/dlang.org/web
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: docs
           path: work/docs
@@ -108,11 +108,11 @@ jobs:
       LDC_VSDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\
       HOST_LDC_VERSION: 1.23.0
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Download docs artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docs
           path: docs/
@@ -162,7 +162,7 @@ jobs:
           cd .. || exit /b
           mkdir artifacts || exit /b
           copy windows\*.exe artifacts || exit /b
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: win_release
           path: artifacts/

.github/workflows/test_release.yml

@@ -51,12 +51,12 @@ jobs:
     steps:
       - name: Download generated releases from the artifacts
         id: download-release
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: dmd-release
+          name: dmd-release-${{ matrix.os }}
 
       - name: Clone installer repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: installer
 

create_dmd_release/build_all.d

@@ -574,7 +574,6 @@ int main(string[] args)
     immutable isPreRelease = isBranch || !verMatch.captures[4].empty;
     immutable dubTag = isBranch ? gitTag : getDubTag(isPreRelease);
 
-    enum optlink = "optlink.zip";
     enum libC = "snn.lib";
     enum libCurl = "libcurl-7.68.0-WinSSL-zlib-x86-x64.zip";
     enum mingwtag = "mingw-libs-8.0.0";
@@ -599,7 +598,6 @@ int main(string[] args)
     const hasWindows = platforms.any!(p => p.os == OS.windows);
     if (hasWindows)
     {
-        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/"~lld, cacheDir~"/"~lld, verifySignature, lld_sha);
@@ -628,8 +626,6 @@ int main(string[] args)
 
     if (hasWindows)
     {
-        // add latest optlink
-        extract(cacheDir~"/"~optlink, workDir~"/windows/extraBins/dmd2/windows/bin/");
         if (exists(workDir~"/windows/extraBins/dmd2/windows/bin/link.exe"))
             remove(workDir~"/windows/extraBins/dmd2/windows/bin/link.exe");
         // add latest dmc libC (snn.lib)

create_dmd_release/create_dmd_release.d

@@ -16,8 +16,6 @@ Prerequisites to Run:
   Examples:
     set LDC_VSDIR="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\"
 - Windows: A GNU make, found in PATH as mingw32-make (to avoid DM make.exe bundled with DMC).
-- Windows: A version of OPTLINK with the /LA[RGEADDRESSAWARE] flag:
-    <https://github.com/DigitalMars/optlink/commit/475bc5c1fa28eaf899ba4ac1dcfe2ab415db16c6>
 - Windows: Microsoft's HTML Help Workshop on the PATH.
 
 Typical Usage:
@@ -524,12 +522,7 @@ void createRelease(string branch)
     {
         copyFile(cloneDir~"/dmd/generated/"~osDirName~"/release/64/dmd"~exe, releaseBin64Dir~"/dmd"~exe);
         version(Windows)
-        {
-            // patch sc.ini to point to optlink.exe in bin folder
-            auto sc_ini = cast(string)std.file.read(cloneDir~"/dmd/compiler/ini/windows/bin/sc.ini");
-            sc_ini = sc_ini.replace(`%@P%\optlink.exe`, `%@P%\..\bin\optlink.exe`);
-            std.file.write(releaseBin64Dir~"/sc.ini", sc_ini);
-        }
+            copyFile(cloneDir~"/dmd/compiler/ini/windows/bin/sc.ini", releaseBin64Dir~"/sc.ini");
         copyDir(cloneDir~"/tools/generated/"~osDirName~"/64", releaseBin64Dir, file => !file.endsWith(obj));
         copyFile(cloneDir~"/dub/bin/dub64"~exe, releaseBin64Dir~"/dub"~exe);
         if (codesign)

create_dmd_release/extras/windows/dmd2/windows/bin/README.TXT

@@ -11,7 +11,6 @@ lib.exe		Librarian			http://www.digitalmars.com/ctg/lib.html
 libcurl.dll	Curl Library			https://curl.haxx.se/
 lld-link.exe	LLVM Linker			https://lld.llvm.org/
 make.exe	Make program			http://www.digitalmars.com/ctg/make.html
-optlink.exe	Linker				http://www.digitalmars.com/ctg/optlink.html
 rdmd.exe	Run D program as a script	http://dlang.org/rdmd.html
 replace.exe	Find/replace text in file(s)
 shell.exe	Test script runner		http://www.digitalmars.com/ctg/shell.html