remove buildx emulator setup

buildkite/src/Command/DockerImage.dhall

@@ -100,9 +100,7 @@ let stepLabel =
 
 let generateStep =
           \(spec : ReleaseSpec.Type)
-      ->  let installBuildx = "./scripts/docker/setup_buildx.sh"
-
-          let exportMinaDebCmd =
+      ->  let exportMinaDebCmd =
                 "export MINA_DEB_CODENAME=${DebianVersions.lowerName
                                               spec.deb_codename}"
 
@@ -228,9 +226,7 @@ let generateStep =
                   , Stable = remoteRepoCmds
                   , Local =
                     [ Cmd.run
-                        (     installBuildx
-                          ++  " && "
-                          ++  exportMinaDebCmd
+                        (     exportMinaDebCmd
                           ++  " && "
                           ++  pruneDockerImages
                           ++  maybeStartDebianRepo

buildkite/src/Command/FixPermissions.dhall

@@ -0,0 +1,23 @@
+let Cmd = ../Lib/Cmds.dhall
+
+let Arch = ../Constants/Arch.dhall
+
+let ContainerImages = ../Constants/ContainerImages.dhall
+
+let fixPermissionsScript = "sudo chown -R opam ."
+
+let command
+    : Arch.Type -> Cmd.Type
+    =     \(arch : Arch.Type)
+      ->  let image =
+                merge
+                  { Amd64 = ContainerImages.minaToolchainBullseye.amd64
+                  , Arm64 = ContainerImages.minaToolchainBullseye.arm64
+                  }
+                  arch
+
+          in  Cmd.runInDocker
+                Cmd.Docker::{ image = image, platform = Arch.platform arch }
+                fixPermissionsScript
+
+in  { command = command }

buildkite/src/Command/MinaArtifact.dhall

@@ -118,8 +118,7 @@ let build_artifacts
       ->  Command.build
             Command.Config::{
             , commands =
-                  [ Cmd.run "./scripts/docker/setup_buildx.sh" ]
-                # Toolchain.select
+                  Toolchain.select
                     spec.toolchainSelectMode
                     spec.debVersion
                     spec.arch

buildkite/src/Command/Packages/Publish.dhall

@@ -34,7 +34,7 @@ let Command = ../Base.dhall
 
 let Cmd = ../../Lib/Cmds.dhall
 
-let Mina = ../Mina.dhall
+let FixPermissions = ../FixPermissions.dhall
 
 let Artifact = ../../Constants/Artifacts.dhall
 
@@ -221,7 +221,9 @@ let publish
 
           in    [ Command.build
                     Command.Config::{
-                    , commands = [ Mina.fixPermissionsCommand ] # commands
+                    , commands =
+                          [ FixPermissions.command Architecture.Type.Amd64 ]
+                        # commands
                     , label = "Debian Packages Publishing"
                     , key =
                         "publish-debians-${DebianChannel.lowerName

buildkite/src/Command/RunInToolchain.dhall

@@ -1,23 +1,23 @@
 let Cmd = ../Lib/Cmds.dhall
 
-let Mina = ../Command/Mina.dhall
-
 let ContainerImages = ../Constants/ContainerImages.dhall
 
 let Arch = ../Constants/Arch.dhall
 
+let FixPermissions = ../Command/FixPermissions.dhall
+
 let runInToolchainImage
-    : Text -> Text -> List Text -> Text -> List Cmd.Type
+    : Text -> Arch.Type -> List Text -> Text -> List Cmd.Type
     =     \(image : Text)
-      ->  \(platform : Text)
+      ->  \(arch : Arch.Type)
       ->  \(environment : List Text)
       ->  \(innerScript : Text)
-      ->    [ Mina.fixPermissionsCommand ]
+      ->    [ FixPermissions.command arch ]
           # [ Cmd.runInDocker
                 Cmd.Docker::{
                 , image = image
                 , extraEnv = environment
-                , platform = platform
+                , platform = Arch.platform arch
                 }
                 innerScript
             ]
@@ -34,19 +34,15 @@ let runInToolchainNoble
                   }
                   arch
 
-          in  runInToolchainImage
-                image
-                (Arch.platform arch)
-                environment
-                innerScript
+          in  runInToolchainImage image arch environment innerScript
 
 let runInToolchainJammy
     : List Text -> Text -> List Cmd.Type
     =     \(environment : List Text)
       ->  \(innerScript : Text)
       ->  runInToolchainImage
             ContainerImages.minaToolchainJammy.amd64
-            (Arch.platform Arch.Type.Amd64)
+            Arch.Type.Amd64
             environment
             innerScript
 
@@ -62,11 +58,7 @@ let runInToolchainBookworm
                   }
                   arch
 
-          in  runInToolchainImage
-                image
-                (Arch.platform arch)
-                environment
-                innerScript
+          in  runInToolchainImage image arch environment innerScript
 
 let runInToolchainBullseye
     : Arch.Type -> List Text -> Text -> List Cmd.Type
@@ -80,19 +72,15 @@ let runInToolchainBullseye
                   }
                   arch
 
-          in  runInToolchainImage
-                image
-                (Arch.platform arch)
-                environment
-                innerScript
+          in  runInToolchainImage image arch environment innerScript
 
 let runInToolchain
     : List Text -> Text -> List Cmd.Type
     =     \(environment : List Text)
       ->  \(innerScript : Text)
       ->  runInToolchainImage
             ContainerImages.minaToolchain
-            (Arch.platform Arch.Type.Amd64)
+            Arch.Type.Amd64
             environment
             innerScript
 

buildkite/src/Constants/Toolchain.dhall

@@ -13,7 +13,7 @@ let runner =
       ->  \(arch : Arch.Type)
       ->  merge
             { Bookworm = RunInToolchain.runInToolchainBookworm arch
-            , Bullseye = RunInToolchain.runInToolchain
+            , Bullseye = RunInToolchain.runInToolchainBullseye arch
             , Jammy = RunInToolchain.runInToolchainJammy
             , Focal = RunInToolchain.runInToolchain
             , Noble = RunInToolchain.runInToolchainNoble arch
@@ -27,10 +27,7 @@ let select =
       ->  merge
             { ByDebianAndArch = runner debVersion arch
             , Custom =
-                    \(image : Text)
-                ->  RunInToolchain.runInToolchainImage
-                      image
-                      (Arch.platform arch)
+                \(image : Text) -> RunInToolchain.runInToolchainImage image arch
             }
             mode
 

buildkite/src/Jobs/Test/EmergencyHfTest.dhall

@@ -14,7 +14,9 @@ let RunWithPostgres = ../../Command/RunWithPostgres.dhall
 
 let ContainerImages = ../../Constants/ContainerImages.dhall
 
-let Mina = ../../Command/Mina.dhall
+let FixPermissions = ../../Command/FixPermissions.dhall
+
+let Arch = ../../Constants/Arch.dhall
 
 let key = "emergency-hf-test"
 
@@ -37,7 +39,7 @@ in  Pipeline.build
         [ Command.build
             Command.Config::{
             , commands =
-                  [ Mina.fixPermissionsCommand ]
+                  [ FixPermissions.command Arch.Type.Amd64 ]
                 # [ RunWithPostgres.runInDockerWithPostgresConn
                       ([] : List Text)
                       (None RunWithPostgres.ScriptOrArchive)