Merge pull request #66 from dcarp/main

Select LDC compiler for macos-latest (aarch64)

Author: dcarp

.github/workflows/bazel-v7.2.2-patched.yaml

@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: ${{ github.ref_name != 'main' }}
 jobs:
   test:
-    uses: ./.github/workflows/bazel-v7.2.2-patched.yaml
+    uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v7.2.2
     with:
       folders: |
         [

.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ bazel_dep(name = "rules_shell", version = "0.3.0", dev_dependency = True)
 bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True)
 
 d = use_extension("//d:extensions.bzl", "d")
-d.toolchain(d_version = "dmd-2.111.0")
+d.toolchain(d_version = "auto")
 use_repo(d, "d_toolchains")
 
 register_toolchains("@d_toolchains//:all")

MODULE.bazel

@@ -19,7 +19,12 @@ d_toolchain = tag_class(attrs = {
 Base name for generated repositories, allowing more than one d toolchain to be registered.
 Overriding the default is only permitted in the root module.
 """, default = _DEFAULT_NAME),
-    "d_version": attr.string(doc = "Explicit version of d.", mandatory = True),
+    "d_version": attr.string(doc = """\
+Version of the compiler. "auto" will select latest known dmd or ldc compiler available for
+the current platform. "dmd" or "ldc" will select the latest known version of the respective
+compiler. If a specific version is desired, it can be specified as "dmd-2.100.0" or
+"ldc-1.30.0".
+""", mandatory = True),
 })
 
 def _toolchain_extension(module_ctx):

d/extensions.bzl

@@ -41,7 +41,7 @@ def rules_d_dependencies():
 ########
 _DOC = "Fetch external tools needed for d toolchain"
 _ATTRS = {
-    "d_version": attr.string(mandatory = True, values = SDK_VERSIONS.keys()),
+    "d_version": attr.string(mandatory = True, values = ["auto", "dmd", "ldc"] + SDK_VERSIONS.keys()),
     "platform": attr.string(mandatory = True, values = PLATFORMS.keys()),
 }
 
@@ -60,10 +60,25 @@ def _archive_prefix(url):
 def _d_repo_impl(repository_ctx):
     d_version = repository_ctx.attr.d_version
     platform = repository_ctx.attr.platform
+
+    if d_version == "auto":
+        for compiler in ["dmd", "ldc"]:
+            for version, platforms in SDK_VERSIONS.items():
+                if version.startswith(compiler) and platform in platforms:
+                    d_version = compiler
+                    break
+            if d_version != "auto":
+                break
+
+    if d_version in ["dmd", "ldc"]:
+        sdks = [version for version, platforms in SDK_VERSIONS.items() if version.startswith(d_version) and platform in platforms]
+        sdks = sorted(sdks, key = lambda x: [int(v) if v.isdigit() else v for v in x[4:].split(".")], reverse = True)
+        d_version = sdks[0] if sdks else d_version
+
     if d_version not in SDK_VERSIONS:
-        repository_ctx.fail("Unknown d_version: %s" % d_version)
+        fail("Unknown d_version: %s" % d_version)
     if platform not in SDK_VERSIONS[d_version]:
-        repository_ctx.fail("Unsupported platform: %s for %s" % (platform, d_version))
+        fail("Unsupported platform: %s for %s" % (platform, d_version))
     sdk = SDK_VERSIONS[d_version][platform]
     repository_ctx.download_and_extract(
         url = sdk["url"],

d/repositories.bzl

@@ -46,5 +46,5 @@ rules_d_dependencies()
 
 d_register_toolchains(
     "d_toolchain",
-    d_version = "dmd-2.110.0",
+    d_version = "auto",
 )