Use windows-11-arm on all jobs

MrSmith33 · MrSmith33 · commit 124b96ffe273 · 2025-10-26T18:03:32.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,13 +3,13 @@
 name: CI
 on:
   push: # test + build + release
-    branches: [ master ]
+    branches: [ master, arm64-windows ]
   pull_request: # test + build
     branches: [ master ]
   release: # test + build + release
     types: [ published ]
 env:
-  DC: ldc-1.41.0-beta1
+  DC: ldc-1.41.0
 
 defaults:
   run:
@@ -20,7 +20,7 @@ jobs:
     name: Build vanilla D
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-15-intel, windows-latest]
+        os: [windows-11-arm]
         build: [debug-fast, release-fast]
     runs-on: ${{ matrix.os }}
     steps:
@@ -30,67 +30,25 @@ jobs:
           compiler: ${{ env.DC }}
       - name: Build
         run: |
+          vswhere
           ./build/setup.sh
           ./build/builder --action=build --remove-build \
             --build=${{matrix.build}} \
+            --target=windows-arm64 \
             --config=nih-cli,nih-static,nih-shared,vbe-static,vbe-shared \
             --compiler=ldc2 --print-commands --print-total-time \
-            --print-callees --pretty --color
+            --print-callees --pretty --color --verbose-callees
   build_no_deps:
     strategy:
       matrix:
         os:
-          - runner: ubuntu-latest
-            target: x64-linux
-          - runner: macos-15-intel
-            target: x64-macos
-          #- runner: macos-14
-          #  target: arm64-macos
-          - runner: windows-latest
-            target: x64-windows
+          - runner: windows-11-arm
+            target: arm64-windows
         v:
           - build: debug-fast,release-fast
             config: nih-cli,nih-static,nih-shared,vbe-static,vbe-shared
           - build: debug
             config: testsuite
-        include:
-          - os:
-              runner: ubuntu-latest
-              target: wasm32-wasi
-            v:
-              build: debug
-              config: testsuite
-          - os:
-              runner: ubuntu-latest
-              target: wasm32-wasi
-            v:
-              build: release-fast
-              config: nih-cli
-          - os:
-              runner: ubuntu-latest
-              target: arm64-linux
-            v:
-              build: debug
-              config: testsuite
-          - os:
-              runner: ubuntu-latest
-              target: arm64-linux
-            v:
-              build: release-fast
-              config: nih-cli,nih-static,nih-shared,vbe-static,vbe-shared
-          - os:
-              runner: ubuntu-latest
-              target: wasm32-unknown
-            v:
-              build: release-fast
-              config: nih-cli,nih-shared,vbe-shared
-        exclude:
-          # https://github.com/ldc-developers/ldc/issues/4696
-          - os:
-              runner: ubuntu-latest
-              target: arm64-linux
-            v:
-              build: debug-fast
     name: Build ${{ matrix.os.target }}-${{ matrix.v.build }}-${{ matrix.v.config }}
     runs-on: ${{ matrix.os.runner }}
     steps:
@@ -116,70 +74,17 @@ jobs:
     strategy:
       matrix:
         os:
-          - runner: ubuntu-latest
-            target: x64-linux
-          - runner: macos-15-intel
-            target: x64-macos
-          #- runner: macos-14
-          #  target: arm64-macos
-          - runner: windows-latest
-            target: x64-windows
           - runner: windows-11-arm
             target: arm64-windows
-          - runner: ubuntu-latest
-            target: wasm32-wasi
-          - runner: ubuntu-latest
-            target: arm64-linux
     runs-on: ${{ matrix.os.runner }}
     steps:
       - uses: actions/checkout@v4
       - uses: dlang-community/setup-dlang@v1
         with:
           compiler: ${{ env.DC }}
-      - uses: jcbhmr/setup-wasmtime@v2
-        if: ${{ matrix.os.target == 'wasm32-wasi' }}
-      - if: ${{ matrix.os.target == 'arm64-linux' }}
-        run: |
-          sudo apt update
-          sudo apt install qemu-user
       - name: Test
         run: |
           ./build/setup.sh
-          ./build/builder --action=run --remove-build --no-deps --build=debug \
+          "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" arm64 && ./build/builder --action=run --remove-build --no-deps --build=debug \
             --target-relaxed=${{ matrix.os.target }} --config=testsuite \
             --compiler=ldc2 --print-commands --print-callees --pretty --color
-  upload:
-    name: Upload build
-    if: github.event_name != 'pull_request'
-    runs-on: ubuntu-latest
-    needs: [build_no_deps, test]
-    steps:
-      # Cloning is needed for `gh release create` to work. It looks repository up in .git folder
-      - uses: actions/checkout@v4
-      # Download build artifacts of other jobs
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: artifact-*
-          merge-multiple: true
-          path: bin/
-      # Update tag, so that we get proper date and commit on github
-      - name: Update CI tag
-        uses: richardsimko/update-tag@v1.0.11
-        if: github.ref == 'refs/heads/master'
-        with:
-          tag_name: CI
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # Create CI release and upload builds
-      - name: Upload
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          ls -R
-          tag=`basename ${{ github.ref }}`
-          if [ $tag = 'master' ]; then
-            tag='CI'
-          fi
-
-          # --clobber Overwrite existing assets of the same name
-          gh release upload $tag bin/*.zip --clobber
diff --git a/build/builder.d b/build/builder.d
@@ -244,6 +244,8 @@ struct GlobalSettings
 
 	// settings parser
 	void setTarget(string option, string target) {
+		stderr.writefln("Start os: %s arch: %s", targetOs, targetArch);
+
 		foreach(component; target.asLowerCase.text.splitter('-')) {
 			auto aliasIndex = countUntil(targetAliases[].map!(a => a.from), component);
 			if (aliasIndex >= 0) {
@@ -268,6 +270,7 @@ struct GlobalSettings
 			stderr.writeln;
 			needsHelp = true;
 		}
+		stderr.writefln("End os: %s arch: %s", targetOs, targetArch);
 	}
 }
 
@@ -345,6 +348,9 @@ GlobalSettings parseSettings(string[] args, const(Config)[] configs) {
 
 	arraySep = ",";
 
+	stderr.writefln("Start os: %s arch: %s", settings.targetOs, settings.targetArch);
+	scope(exit) stderr.writefln("End os: %s arch: %s", settings.targetOs, settings.targetArch);
+
 	retry_parse_opts:
 	try
 	{
@@ -455,6 +461,7 @@ struct CompileParams {
 struct Job {
 	CompileParams params;
 	string[] args;
+	string[string] envVars;
 	string workDir;
 	// When executable is produced it will be a first artifact
 	string[] artifacts;
@@ -467,6 +474,71 @@ struct Job {
 	bool printOutput;
 }
 
+bool isSomeWindowsTarget(in GlobalSettings gs) {
+	if (gs.targetOs != TargetOs.windows) return false;
+	if (gs.targetArch == TargetArch.arm64) return true;
+	if (gs.targetArch == TargetArch.x64) return true;
+	return false;
+}
+
+void addWindowsLibs(in GlobalSettings gs, ref string[string] envVars) {
+	import std.file;
+
+	if (hostOs != TargetOs.windows) return;
+	if (!isSomeWindowsTarget(gs)) return;
+
+	import std.process : execute, Config;
+	auto result = execute(["vswhere", "-latest", "-property", "resolvedInstallationPath"], null, Config.none, size_t.max);
+
+	if (result.status != 0) {
+		stderr.writeln("vswhere exited with ", result.status);
+		stderr.writeln("Cannot find Windows SDK and Visual Studio");
+		return;
+	}
+
+	// LDC will skip environment setup if it detects VSINSTALLDIR and VSCMD_ARG_TGT_ARCH
+	auto vsPath = result.output.strip;
+	envVars["VSINSTALLDIR"] = vsPath;
+	envVars["VSCMD_ARG_TGT_ARCH"] = archName[gs.targetArch];
+
+	auto sdkPath = `C:\Program Files (x86)\Windows Kits\10\Lib`;
+	if (!exists(sdkPath)) {
+		stderr.writeln("Cannot find Windows SDK at %s", sdkPath);
+		return;
+	}
+
+	string maxSdkPath;
+	foreach(DirEntry e; dirEntries(sdkPath, SpanMode.shallow)) {
+		if (maxSdkPath is null || e.name > maxSdkPath) {
+			maxSdkPath = e.name;
+		}
+	}
+
+	auto vsToolsPath = buildPath(vsPath, `VC\Tools\MSVC`);
+	string maxVSPath;
+	foreach(DirEntry e; dirEntries(vsToolsPath, SpanMode.shallow)) {
+		if (maxVSPath is null || e.name > maxVSPath) {
+			maxVSPath = e.name;
+		}
+	}
+
+	auto umLibsPath = buildPath(maxSdkPath, "um", archName[gs.targetArch]);
+	auto ucrtLibsPath = buildPath(maxSdkPath, "ucrt", archName[gs.targetArch]);
+	auto vsLibsPath = buildPath(maxVSPath, "lib", archName[gs.targetArch]);
+
+	auto umTestPath = buildPath(umLibsPath, "kernel32.lib");
+	auto ucrtTestPath = buildPath(ucrtLibsPath, "libucrt.lib");
+	auto vsTestPath = buildPath(vsLibsPath, "libcmt.lib");
+
+	if (maxSdkPath is null || maxVSPath is null || !exists(umTestPath) || !exists(ucrtTestPath) || !exists(vsTestPath)) {
+		stderr.writeln("Cannot find Visual Studio at %s", vsPath);
+		return;
+	}
+
+	import std.array : join;
+	envVars["LIB"] = join([umLibsPath, ucrtLibsPath, vsLibsPath], ";");
+}
+
 Job makeCompileJob(in GlobalSettings gs, in CompileParams params) {
 	import std.path : buildPath;
 
@@ -526,12 +598,16 @@ Job makeCompileJob(in GlobalSettings gs, in CompileParams params) {
 		args ~= buildPath(params.srcDir, "custom_object.d");
 	}
 
+	string[string] envVars;
+	addWindowsLibs(gs, envVars);
+
 	Job job = {
 		params : params,
 		args : args,
 		artifacts : artifacts,
 		extraArtifacts : extraArtifacts,
 		printOutput : gs.printCallees,
+		envVars : envVars,
 	};
 	return job;
 }
@@ -619,10 +695,16 @@ JobResult runJob(in GlobalSettings gs, in Job job) {
 	}
 
 	void printCommand() {
-		if (gs.prettyPrint)
+		if (gs.prettyPrint) {
 			stderr.writefln("> %-(%s\n| %)", job.args);
-		else
-			stderr.writefln("> %-(%s %)", job.args);
+			foreach(key, val; job.envVars)
+				stderr.writefln("| $% = %s", key, val);
+		} else {
+			stderr.writef("> %-(%s %)", job.args);
+			foreach(key, val; job.envVars)
+				stderr.writef(" $%s=%s", key, val);
+			stderr.writeln;
+		}
 	}
 
 	if (gs.printCommands) printCommand;
@@ -632,7 +714,7 @@ JobResult runJob(in GlobalSettings gs, in Job job) {
 	MonoTime startTime = currTime;
 	import std.process : execute, Config;
 	try {
-		auto result = execute(job.args, null, Config.none, size_t.max, job.workDir);
+		auto result = execute(job.args, job.envVars, Config.none, size_t.max, job.workDir);
 		MonoTime endTime = currTime;
 
 		void printCalleeOutput() {
