diff options
| -rwxr-xr-x | cdist | 8 | ||||
| -rwxr-xr-x | make-ccache-volume | 8 |
2 files changed, 8 insertions, 8 deletions
@@ -943,10 +943,8 @@ def target_factory(args): p = s.split('-') if len(p) != 3: raise Error("Bad Linux target name `%s'; must be something like ubuntu-16.04-32 (i.e. distro-version-bits), fedora-41-arm or debian-64-x86 (distro-version-cpu)" % s) - if p[2] == "64" or p[2] == "x86": - target = LinuxDockerTarget(distro=p[0], version=p[1], cpu="x86", directory=args.work, environment_version=args.environment_version) - elif p[2] == "arm": - target = LinuxLocalTarget(distro=p[0], version=p[1], cpu="arm", directory=args.work, environment_version=args.environment_version) + cpu = 'x86' if p[2] == "64" or p[2] == "x86" else 'arm' + target = LinuxDockerTarget(distro=p[0], version=p[1], cpu=cpu, directory=args.work, environment_version=args.environment_version) elif s.startswith('arch-'): p = s.split('-') if len(p) != 2: @@ -958,6 +956,8 @@ def target_factory(args): target = OSXUniversalTarget(args.work, environment_version=args.environment_version) elif s == 'osx-intel': target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_intel_deployment'), args.work, environment_version=args.environment_version) + elif s == 'osx-arm': + target = OSXSingleTarget('arm64', config.get('osx_sdk'), config.get('osx_arm_deployment'), args.work, environment_version=args.environment_version) elif s == 'osx-old': target = OSXSingleTarget('x86_64', config.get('osx_sdk'), config.get('osx_old_deployment'), args.work, False, environment_version=args.environment_version) elif s == 'source': diff --git a/make-ccache-volume b/make-ccache-volume index 6a6d25b..1578cdd 100755 --- a/make-ccache-volume +++ b/make-ccache-volume @@ -1,12 +1,12 @@ #!/bin/bash -images="ubuntu-14.04-64 ubuntu-16.04-64 ubuntu-18.04-64 ubuntu-20.04-64 ubuntu-22.04-64 ubuntu-24.04-64 ubuntu-25.04-64 ubuntu-25.10-64" +images="ubuntu-14.04-64 ubuntu-16.04-64 ubuntu-18.04-64 ubuntu-20.04-64 ubuntu-22.04-64 ubuntu-24.04-64 ubuntu-25.04-64 ubuntu-25.10-64 ubuntu-26.04-64" images="$images windows windows_v2.18.x windows_v2.20.x" images="$images debian-10-64 debian-11-64 debian-12-64 debian-13-64 debian-unstable-64" -images="$images fedora-39-64 fedora-40-64 fedora-41-64 fedora-42-64 fedora-43-64" +images="$images fedora-39-64 fedora-40-64 fedora-41-64 fedora-42-64 fedora-43-64 fedora-44-64" images="$images mageia-8-64 mageia-9-64" -images="$images centos-7-64 centos-stream8-64 centos-stream9-64" -images="$images arch-64 rocky-8-64 rocky-9-64 rocky-10-64" +images="$images centos-7-64 centos-stream8-64 centos-stream9-64 centos-stream10-64" +images="$images arch-64 rocky-8-64 rocky-9-64 rocky-10-64 test" docker volume rm ccache docker volume create ccache |