Merge branch 'main' into mf-release_0.7.0

maxfierke · Oct 16, 2024 · cf5421c · cf5421c
2 parents 6736728 + 90124ea
commit cf5421c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -114,7 +114,7 @@ jobs:
           mstrap
 
     - name: Build signed & notorized release bundle
-      run: make release RELEASE=1 STATIC=1 TARGET_ARCH=x86_64
+      run: make release RELEASE=1 STATIC=1 TARGET_ARCH=x86_64 CODESIGN_IDENTITY="${{ secrets.CODESIGN_IDENTITY }}"
 
     - name: Smoke test the codesigned release
       run: bin/mstrap --help
@@ -157,7 +157,7 @@ jobs:
           mstrap
 
     - name: Build signed & notorized release bundle
-      run: make release RELEASE=1 STATIC=1 TARGET_ARCH=arm64
+      run: make release RELEASE=1 STATIC=1 TARGET_ARCH=arm64 CODESIGN_IDENTITY="${{ secrets.CODESIGN_IDENTITY }}"
 
     - name: Smoke test the codesigned release
       run: bin/mstrap --help

diff --git a/src/mstrap/steps/dependencies_step.cr b/src/mstrap/steps/dependencies_step.cr
@@ -18,6 +18,7 @@ module MStrap
       def bootstrap
         install_mise if runtime_managers.any? { |rm| rm.name == "mise" }
         install_rustup if runtime_managers.any? { |rm| rm.name == "rustup" }
+        set_strap_env!
         strap_sh
         load_profile!
         brew_bundle