Revert "[GHA: Stress test macOS jobs]"

This reverts commit 7ca007b.

Author: kinke

.github/actions/7-package/action.yml

@@ -170,7 +170,6 @@ runs:
       run: mv ../artifacts ./
 
     - name: Upload artifact(s)
-      if: runner.os != 'macOS'
       uses: actions/upload-artifact@v4
       with:
         name: ${{ env.ARTIFACT_NAME }}

.github/workflows/main.yml

@@ -23,75 +23,93 @@ jobs:
       matrix:
         include:
 
-          - job_name: macOS x86_64_1
-            os: macos-13
-            arch: x86_64
-            # https://github.com/ldc-developers/ldc/issues/4462:
-            # When using LTO, we need to explicitly export ~all symbols for plugin support via `ld64 -exported_symbol '__*'`.
-            # Additionally `-w` to suppress resulting linker warnings.
-            extra_cmake_flags: >-
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
-              -DEXTRA_CXXFLAGS=-flto=full
-            with_pgo: true
-          - job_name: macOS x86_64_2
-            os: macos-13
+          - job_name: Linux x86_64 multilib
+            os: ubuntu-22.04
             arch: x86_64
+            # To improve portability of the generated binaries, link the C++ standard library statically.
             extra_cmake_flags: >-
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
+              -DMULTILIB=ON
+              -DCMAKE_C_COMPILER=clang
+              -DCMAKE_CXX_COMPILER=clang++
+              -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++
+              -DJITRT_EXTRA_LDFLAGS=-static-libstdc++
+              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
               -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
-          - job_name: macOS x86_64_3
-            os: macos-13
-            arch: x86_64
+
+          - job_name: Linux aarch64
+            os: ubuntu-22.04-arm
+            arch: aarch64
             extra_cmake_flags: >-
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
+              -DCMAKE_C_COMPILER=clang
+              -DCMAKE_CXX_COMPILER=clang++
+              -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++
+              -DJITRT_EXTRA_LDFLAGS=-static-libstdc++
+              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
               -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
-          - job_name: macOS x86_64_4
-            os: macos-13
+
+          - job_name: Alpine musl x86_64
+            os: ubuntu-latest
+            container_image: alpine:3.21
             arch: x86_64
+            base_cmake_flags: >-
+              -DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=x86_64
+              -DLLVM_IS_SHARED=OFF
+              -DLDC_ENABLE_PLUGINS=OFF
+              -DLDC_DYNAMIC_COMPILE=OFF
+            # TSan and XRay do not work.
             extra_cmake_flags: >-
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
+              -DTEST_COMPILER_RT_LIBRARIES="profile;lsan;asan;msan;fuzzer"
+              -DLDC_INSTALL_LTOPLUGIN=OFF
+              -DLDC_FULLY_STATIC=ON
+              -DCMAKE_C_COMPILER=clang
+              -DCMAKE_CXX_COMPILER=clang++
+              -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++
+              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
               -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
-          - job_name: macOS x86_64_5
+
+          - job_name: macOS x86_64
             os: macos-13
             arch: x86_64
+            # https://github.com/ldc-developers/ldc/issues/4462:
+            # When using LTO, we need to explicitly export ~all symbols for plugin support via `ld64 -exported_symbol '__*'`.
+            # Additionally `-w` to suppress resulting linker warnings.
             extra_cmake_flags: >-
               -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
               -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
 
-          - job_name: macOS arm64_1
+          - job_name: macOS arm64
             os: macos-14
             arch: arm64
             extra_cmake_flags: >-
               -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
             #  -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
-          - job_name: macOS arm64_2
-            os: macos-14
-            arch: arm64
-            extra_cmake_flags: >-
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
-            with_pgo: true
-          - job_name: macOS arm64_3
-            os: macos-14
-            arch: arm64
-            extra_cmake_flags: >-
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
-            with_pgo: true
-          - job_name: macOS arm64_4
-            os: macos-14
-            arch: arm64
+
+          - job_name: Windows x64
+            os: windows-2025
+            arch: x64
+            base_cmake_flags: >-
+              -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
             extra_cmake_flags: >-
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
+              "-DD_COMPILER_FLAGS=-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
+              -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
-          - job_name: macOS arm64_5
-            os: macos-14
-            arch: arm64
+
+          - job_name: Windows x86
+            os: windows-2025
+            arch: x86
+            base_cmake_flags: >-
+              -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
+            # `RT_CFLAGS=-m32` needed to make 64-bit clang-cl output 32-bit code for druntime integration tests
             extra_cmake_flags: >-
-              -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
+              -DRT_CFLAGS=-m32
+            # Undefined symbol errors with FullLTO; ThinLTO used to work, but apparently miscompiles a lexer.d:138 assertion since v1.33.
+            #  "-DD_COMPILER_FLAGS=-O -flto=thin -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
+            #  -DEXTRA_CXXFLAGS=-flto=thin
             with_pgo: true
 
     name: ${{ matrix.job_name }}
@@ -207,3 +225,112 @@ jobs:
         with:
           arch: ${{ matrix.arch }}
           os: ${{ startsWith(matrix.container_image, 'alpine') && 'alpine' || '' }}
+
+
+  # Cross-compilation jobs for non-native targets.
+  # druntime/Phobos/LDC unittests aren't built; all test stages are skipped.
+  build-cross:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+
+          - job_name: Android armv7a
+            host_os: ubuntu-22.04
+            os: android
+            arch: armv7a
+            android_x86_arch: i686
+
+          - job_name: Android aarch64
+            host_os: ubuntu-22.04
+            os: android
+            arch: aarch64
+            android_x86_arch: x86_64
+            extra_cmake_flags: >-
+              -DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=aarch64-android
+
+    name: ${{ matrix.job_name }}
+    runs-on: ${{ matrix.host_os }}
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 50
+      - name: Install prerequisites
+        uses: ./.github/actions/1-setup
+        with:
+          llvm_version: ${{ env.LLVM_VERSION }}
+          arch: x86_64
+      - name: Build bootstrap LDC
+        uses: ./.github/actions/2-build-bootstrap
+      - name: Build LDC with PGO instrumentation & gather profile from compiling default libs
+        if: matrix.with_pgo
+        uses: ./.github/actions/2a-build-pgo
+      - name: Cross-compile LDC to ${{ matrix.os }}-${{ matrix.arch }}
+        uses: ./.github/actions/3-build-cross
+        with:
+          arch: ${{ matrix.arch }}
+          os: ${{ matrix.os }}
+          llvm_version: ${{ env.LLVM_VERSION }}
+          cmake_flags: ${{ matrix.extra_cmake_flags }}
+          with_pgo: ${{ matrix.with_pgo }}
+
+      - name: Install LDC & make portable
+        uses: ./.github/actions/5-install
+        with:
+          cross_compiling: true
+      - name: 'Android: Cross-compile ${{ matrix.android_x86_arch }} libraries & copy to install dir'
+        if: matrix.os == 'android'
+        uses: ./.github/actions/5a-android-x86
+        with:
+          arch: ${{ matrix.android_x86_arch }}
+
+      - name: Create package & upload artifact(s)
+        uses: ./.github/actions/7-package
+        with:
+          arch: ${{ matrix.arch }}
+          os: ${{ matrix.os }}
+          cross_target_triple: ${{ env.CROSS_TRIPLE }}
+
+
+  merge-macos:
+    name: macOS universal
+    runs-on: macos-latest
+    timeout-minutes: 30
+    needs: build-native
+    steps:
+      - uses: actions/checkout@v4
+      - name: Merge x86_64 & arm64 packages to universal one
+        uses: ./.github/actions/merge-macos
+
+  merge-windows:
+    name: Windows multilib
+    runs-on: windows-2025
+    timeout-minutes: 30
+    needs: build-native
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 50
+      - name: Merge x64 & x86 packages to multilib one & build installer
+        uses: ./.github/actions/merge-windows
+
+
+  upload-to-github:
+    name: Upload to GitHub
+    if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    needs:
+      - build-native
+      - build-cross
+      - merge-macos
+      - merge-windows
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Upload all artifacts to GitHub release
+        uses: ./.github/actions/upload-to-github