From 03fe5ba8ac1acdf7389b38c28cec452b2ba3a9c4 Mon Sep 17 00:00:00 2001
From: Martin Kinkelin <noone@nowhere.com>
Date: Sat, 12 Sep 2026 14:27:04 +0200
Subject: [PATCH] Circle CI: Adapt to upcoming breaking change

Analogous to https://github.com/dlang/dmd/pull/23830, incl. a minimal
simplification of the run.sh script.
---
 .circleci/config.yml | 10 +++++-----
 .circleci/run.sh     |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3649f29295c..1bb43038762 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,10 +1,10 @@
-version: 2
+version: 2.1
 jobs:
   build:
     working_directory: ~/phobos
-    docker:
-      - image: cimg/base:current-20.04
-    parallelism: 1
+    machine:
+      image: ubuntu-2604:current
+    resource_class: large.gen3
     steps:
       - checkout
       - run:
@@ -12,7 +12,7 @@ jobs:
           name: Install DMD
       - run:
           command: ./.circleci/run.sh setup-repos
-          name: Clone DMD & DRuntime
+          name: Clone DMD & tools and build DMD & druntime
       - run:
           command: ./.circleci/run.sh publictests
           name: Run all public unittests
diff --git a/.circleci/run.sh b/.circleci/run.sh
index 06e54adace6..a85c386fefa 100755
--- a/.circleci/run.sh
+++ b/.circleci/run.sh
@@ -5,7 +5,7 @@ set -uexo pipefail
 HOST_DMD_VER=2.095.0
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
 DUB=${DUB:-dub}
-N=${N:-2}
+N=${N:-$(nproc)}
 CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
 BUILD="debug"
 PIC=1
@@ -40,7 +40,7 @@ install_deps() {
     env
 }
 
-# clone dmd and druntime
+# clone dmd and tools
 clone() {
     local url="$1"
     local path="$2"
@@ -89,8 +89,7 @@ setup_repos()
     source "$(CURL_USER_AGENT="$CURL_USER_AGENT" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
 
     # build dmd and druntime
-    pushd ../dmd && ./src/build.d MODEL=$MODEL HOST_DMD="$DMD" BUILD=$BUILD PIC="$PIC" all && popd
-    pushd ../dmd && make -j"$N" -C druntime -f posix.mak MODEL=$MODEL HOST_DMD="$DMD" BUILD=$BUILD && popd
+    make -C ../dmd -j"$N" MODEL=$MODEL BUILD=$BUILD PIC="$PIC"
 }
 
 # run unittest with coverage