Merge branch 'main' of github.com:GaloyMoney/stablesats-rs into HEAD

GaloyMoney · Nov 14, 2023 · 2aab6f1 · 2aab6f1
2 parents 0695f91 + 0c62b5d
commit 2aab6f1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -74,30 +74,30 @@ jobs:
       run:
         path: pipeline-tasks/ci/tasks/update-repo.sh
   - in_parallel:
-    - task: build-osx-release
-      privileged: true
-      config:
-        platform: linux
-        image_resource:
-          type: registry-image
-          source:
-            username: #@ data.values.osxcross_docker_username
-            password: #@ data.values.osxcross_docker_password
-            repository: #@ data.values.osxcross_repository
-        inputs:
-        - name: version
-        - name: pipeline-tasks
-        - name: repo
-        outputs:
-        - name: x86_64-apple-darwin
-        caches:
-        - path: cargo-home
-        - path: cargo-target-dir
-        params:
-          TARGET: x86_64-apple-darwin
-          OUT: x86_64-apple-darwin
-        run:
-          path: pipeline-tasks/ci/tasks/build-release.sh
+    #!- task: build-osx-release
+    #!  privileged: true
+    #!  config:
+    #!    platform: linux
+    #!    image_resource:
+    #!      type: registry-image
+    #!      source:
+    #!        username: #@ data.values.osxcross_docker_username
+    #!        password: #@ data.values.osxcross_docker_password
+    #!        repository: #@ data.values.osxcross_repository
+    #!    inputs:
+    #!    - name: version
+    #!    - name: pipeline-tasks
+    #!    - name: repo
+    #!    outputs:
+    #!    - name: x86_64-apple-darwin
+    #!    caches:
+    #!    - path: cargo-home
+    #!    - path: cargo-target-dir
+    #!    params:
+    #!      TARGET: x86_64-apple-darwin
+    #!      OUT: x86_64-apple-darwin
+    #!    run:
+    #!      path: pipeline-tasks/ci/tasks/build-release.sh
     - task: build-static-release
       privileged: true
       config:
@@ -132,7 +132,7 @@ jobs:
       image_resource: #@ rust_task_image_config()
       platform: linux
       inputs:
-      - name: x86_64-apple-darwin
+      #! - name: x86_64-apple-darwin
       - name: x86_64-unknown-linux-musl
       - name: version
       - name: pipeline-tasks
@@ -277,7 +277,7 @@ jobs:
           CHARTS_SUBDIR: "stablesats"
         run:
           path: pipeline-tasks/ci/tasks/open-charts-pr.sh
-  
+
 resources:
 - #@ repo_resource(True)
 - #@ pipeline_tasks_resource()

diff --git a/ci/tasks/github-release.sh b/ci/tasks/github-release.sh
@@ -4,4 +4,4 @@ set -eu
 
 mkdir artifacts/binaries
 mv x86_64-unknown-linux-musl/* artifacts/binaries
-mv x86_64-apple-darwin/* artifacts/binaries
+# mv x86_64-apple-darwin/* artifacts/binaries