Cross compile osx binaries, removing dependency on OSX workers

Signed-off-by: Derek Richard <[email protected]>
concourse · Dec 3, 2024 · 33376df · 33376df
1 parent e04f8cd
commit 33376df
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 85 deletions.
diff --git a/pipelines/concourse.yml b/pipelines/concourse.yml
@@ -203,18 +203,13 @@ jobs:
       image: unit-image
       file: ci/tasks/unit.yml
       input_mapping: {concourse: built-concourse}
-    - task: fly-darwin
-      file: ci/tasks/fly-darwin.yml
     - task: fly-windows
       file: ci/tasks/fly-windows.yml
     - task: unit-baggageclaim
       image: unit-image
       file: ci/tasks/unit-baggageclaim.yml
       privileged: true
       input_mapping: {concourse: built-concourse}
-    - task: unit-baggageclaim-darwin
-      file: ci/tasks/unit-baggageclaim-darwin.yml
-      input_mapping: {concourse: built-concourse}
     - task: unit-baggageclaim-windows
       file: ci/tasks/unit-baggageclaim-windows.yml
       input_mapping: {concourse: built-concourse}
@@ -313,6 +308,7 @@ jobs:
         file: ci/tasks/fly-build-windows.yml
       - task: fly-darwin
         file: ci/tasks/fly-build-darwin.yml
+        image: golang-builder-image-rootfs
   - task: build
     image: oci-build-task
     privileged: true
@@ -582,6 +578,7 @@ jobs:
       file: ci/tasks/fly-build-windows.yml
     - task: fly-darwin
       file: ci/tasks/fly-build-darwin.yml
+      image: golang-builder-image
   - in_parallel:
       fail_fast: true
       steps:

diff --git a/pipelines/release.yml b/pipelines/release.yml
@@ -262,6 +262,7 @@ jobs:
         file: ci/tasks/fly-build-windows.yml
       - task: fly-darwin
         file: ci/tasks/fly-build-darwin.yml
+        image: golang-builder-image-rootfs
   - task: build
     image: builder
     privileged: true
@@ -556,6 +557,7 @@ jobs:
       file: ci/tasks/fly-build-windows.yml
     - task: fly-darwin
       file: ci/tasks/fly-build-darwin.yml
+      image: golang-builder-image
   - in_parallel:
       fail_fast: true
       steps:

diff --git a/tasks/concourse-build-darwin.yml b/tasks/concourse-build-darwin.yml
@@ -1,5 +1,5 @@
 ---
-platform: darwin
+platform: linux
 
 inputs:
 - name: concourse

diff --git a/tasks/fly-build-darwin.yml b/tasks/fly-build-darwin.yml
@@ -1,5 +1,5 @@
 ---
-platform: darwin
+platform: linux
 
 inputs:
 - name: concourse
@@ -13,5 +13,8 @@ outputs:
 caches:
 - path: gopath
 
+params:
+  GOOS: darwin
+
 run:
   path: ci/tasks/scripts/fly-build
diff --git a/tasks/fly-darwin.yml b/tasks/fly-darwin.yml
diff --git a/tasks/scripts/fly-darwin b/tasks/scripts/fly-darwin
diff --git a/tasks/scripts/unit-baggageclaim-darwin b/tasks/scripts/unit-baggageclaim-darwin
diff --git a/tasks/scripts/validate-darwin-rc b/tasks/scripts/validate-darwin-rc
diff --git a/tasks/unit-baggageclaim-darwin.yml b/tasks/unit-baggageclaim-darwin.yml
diff --git a/tasks/validate-darwin-rc.yml b/tasks/validate-darwin-rc.yml