Merge branch 'cccc' of https://github.com/BlueWallet/BlueWallet into cccc
This commit is contained in:
Marcos Rodriguez
commit
8044d37666
37
.github/workflows/build-mac-catalyst.yml
vendored
37
.github/workflows/build-mac-catalyst.yml
vendored
@ -44,17 +44,50 @@ jobs:
|
||||
env:
|
||||
SKIP_APP_STORE_CONNECT_AUTH: '1'
|
||||
|
||||
- name: Import Developer ID certificate
|
||||
env:
|
||||
DEVELOPER_ID_CERT_BASE64: ${{ secrets.DEVELOPER_ID_CERT_BASE64 }}
|
||||
DEVELOPER_ID_CERT_PASSWORD: ${{ secrets.DEVELOPER_ID_CERT_PASSWORD }}
|
||||
if: env.DEVELOPER_ID_CERT_BASE64 != ''
|
||||
run: |
|
||||
CERT_PATH=$RUNNER_TEMP/developer_id.p12
|
||||
KEYCHAIN_PATH=$RUNNER_TEMP/catalyst-signing.keychain-db
|
||||
KEYCHAIN_PASSWORD=$(openssl rand -base64 24)
|
||||
|
||||
echo "$DEVELOPER_ID_CERT_BASE64" | base64 --decode > "$CERT_PATH"
|
||||
|
||||
security create-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
|
||||
security set-keychain-settings -lut 21600 "$KEYCHAIN_PATH"
|
||||
security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
|
||||
security import "$CERT_PATH" -P "$DEVELOPER_ID_CERT_PASSWORD" -A -t cert -f pkcs12 -k "$KEYCHAIN_PATH"
|
||||
security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
|
||||
security list-keychains -d user -s "$KEYCHAIN_PATH" $(security list-keychains -d user | tr -d '"')
|
||||
|
||||
- name: Build Mac Catalyst app with Fastlane
|
||||
id: build_catalyst
|
||||
run: bundle exec fastlane ios build_catalyst_app_lane
|
||||
env:
|
||||
SKIP_APP_STORE_CONNECT_AUTH: '1'
|
||||
SKIP_CLEAR_DERIVED_DATA: '1'
|
||||
CATALYST_SIGNING_IDENTITY: ${{ secrets.CATALYST_SIGNING_IDENTITY || 'Developer ID Application' }}
|
||||
CATALYST_TEAM_ID: ${{ secrets.CATALYST_TEAM_ID }}
|
||||
CATALYST_SKIP_CODESIGNING: ${{ secrets.CATALYST_SIGNING_IDENTITY == '' && '1' || '0' }}
|
||||
APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
|
||||
APPLE_API_ISSUER_ID: ${{ secrets.APPLE_API_ISSUER_ID }}
|
||||
APPLE_API_KEY_PATH: ${{ secrets.APPLE_API_KEY_PATH }}
|
||||
NOTARIZE_APPLE_ID: ${{ secrets.NOTARIZE_APPLE_ID }}
|
||||
NOTARIZE_PASSWORD: ${{ secrets.NOTARIZE_PASSWORD }}
|
||||
|
||||
- name: Upload Mac Catalyst artifact
|
||||
- name: Clean up keychain
|
||||
if: always()
|
||||
run: |
|
||||
KEYCHAIN_PATH=$RUNNER_TEMP/catalyst-signing.keychain-db
|
||||
security delete-keychain "$KEYCHAIN_PATH" 2>/dev/null || true
|
||||
|
||||
- name: Upload Mac Catalyst DMG
|
||||
if: success()
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: BlueWallet-Mac-Catalyst
|
||||
path: ${{ steps.build_catalyst.outputs.catalyst_zip_path }}
|
||||
path: ${{ steps.build_catalyst.outputs.catalyst_dmg_path }}
|
||||
if-no-files-found: warn
|
||||
|
||||
@ -466,13 +466,14 @@ platform :ios do
|
||||
clean_install: true)
|
||||
end
|
||||
|
||||
desc "Build Mac Catalyst app"
|
||||
desc "Build Mac Catalyst app, create DMG, and notarize"
|
||||
lane :build_catalyst_app_lane do
|
||||
Dir.chdir(project_root) do
|
||||
UI.message("Building Mac Catalyst application from: #{Dir.pwd}")
|
||||
|
||||
workspace_path = File.join(project_root, "ios", "BlueWallet.xcworkspace")
|
||||
derived_data_path = File.join(project_root, "ios", "build", "catalyst-derived-data")
|
||||
output_dir = File.join(project_root, "ios", "build", "catalyst-output")
|
||||
|
||||
if ENV['SKIP_CLEAR_DERIVED_DATA'] == '1'
|
||||
UI.message('Skipping clear_derived_data_lane (SKIP_CLEAR_DERIVED_DATA=1)')
|
||||
@ -480,20 +481,33 @@ platform :ios do
|
||||
clear_derived_data_lane
|
||||
end
|
||||
FileUtils.mkdir_p(derived_data_path)
|
||||
FileUtils.mkdir_p(output_dir)
|
||||
|
||||
# Determine if we should code-sign
|
||||
signing_identity = ENV['CATALYST_SIGNING_IDENTITY'] || "Developer ID Application"
|
||||
should_sign = ENV['CATALYST_SKIP_CODESIGNING'] != '1'
|
||||
|
||||
xcargs_str = "ARCHS=arm64 ONLY_ACTIVE_ARCH=YES"
|
||||
if should_sign && ENV['CATALYST_TEAM_ID']
|
||||
xcargs_str += " DEVELOPMENT_TEAM=#{ENV['CATALYST_TEAM_ID']}"
|
||||
xcargs_str += " CODE_SIGN_IDENTITY=\"#{signing_identity}\""
|
||||
xcargs_str += " CODE_SIGN_STYLE=Manual"
|
||||
end
|
||||
|
||||
build_app(
|
||||
scheme: "BlueWallet",
|
||||
workspace: workspace_path,
|
||||
configuration: "Release",
|
||||
destination: "generic/platform=macOS,variant=Mac Catalyst",
|
||||
xcargs: "ARCHS=arm64 ONLY_ACTIVE_ARCH=YES",
|
||||
xcargs: xcargs_str,
|
||||
clean: true,
|
||||
skip_codesigning: true,
|
||||
skip_codesigning: !should_sign,
|
||||
skip_package_ipa: true,
|
||||
derived_data_path: derived_data_path,
|
||||
buildlog_path: File.join(project_root, "ios", "build_logs")
|
||||
)
|
||||
|
||||
# Locate the .app
|
||||
archive_path = lane_context[SharedValues::XCODEBUILD_ARCHIVE]
|
||||
if archive_path.nil? || archive_path.empty?
|
||||
archive_path = Dir.glob(File.join(Dir.home, "Library/Developer/Xcode/Archives/**/*.xcarchive")).max_by { |path| File.mtime(path) }
|
||||
@ -506,23 +520,81 @@ platform :ios do
|
||||
|
||||
catalyst_app_path = candidate_paths.compact.find { |path| File.exist?(path) }
|
||||
UI.user_error!("Mac Catalyst app was not found after build") if catalyst_app_path.nil?
|
||||
UI.success("Mac Catalyst app found at: #{catalyst_app_path}")
|
||||
|
||||
# Zip the .app bundle so it stays a proper macOS app bundle
|
||||
app_dir = File.dirname(catalyst_app_path)
|
||||
app_name = File.basename(catalyst_app_path)
|
||||
zip_path = File.join(app_dir, "BlueWallet-Mac-Catalyst.zip")
|
||||
sh("cd '#{app_dir}' && zip -r -y '#{zip_path}' '#{app_name}'")
|
||||
UI.user_error!("Failed to create zip at #{zip_path}") unless File.exist?(zip_path)
|
||||
# --- Code-sign with Developer ID if credentials are available ---
|
||||
if should_sign && ENV['CATALYST_SIGNING_IDENTITY']
|
||||
UI.message("Re-signing app with: #{signing_identity}")
|
||||
sh("codesign --deep --force --options runtime --sign \"#{signing_identity}\" '#{catalyst_app_path}'")
|
||||
sh("codesign --verify --deep --strict '#{catalyst_app_path}'")
|
||||
UI.success("App signed and verified")
|
||||
end
|
||||
|
||||
# --- Create DMG ---
|
||||
dmg_path = File.join(output_dir, "BlueWallet-Mac-Catalyst.dmg")
|
||||
UI.message("Creating DMG at: #{dmg_path}")
|
||||
|
||||
# Create a temporary folder for DMG contents
|
||||
dmg_staging = File.join(output_dir, "dmg-staging")
|
||||
FileUtils.rm_rf(dmg_staging)
|
||||
FileUtils.mkdir_p(dmg_staging)
|
||||
FileUtils.cp_r(catalyst_app_path, dmg_staging)
|
||||
|
||||
# Create Applications symlink for drag-to-install
|
||||
sh("ln -s /Applications '#{dmg_staging}/Applications'")
|
||||
|
||||
# Build DMG
|
||||
FileUtils.rm_f(dmg_path)
|
||||
sh("hdiutil create -volname 'BlueWallet' -srcfolder '#{dmg_staging}' -ov -format UDZO '#{dmg_path}'")
|
||||
UI.user_error!("DMG was not created at #{dmg_path}") unless File.exist?(dmg_path)
|
||||
UI.success("DMG created at: #{dmg_path}")
|
||||
|
||||
# Clean up staging
|
||||
FileUtils.rm_rf(dmg_staging)
|
||||
|
||||
# --- Notarize if credentials are available ---
|
||||
if ENV['APPLE_API_KEY_ID'] && ENV['APPLE_API_ISSUER_ID'] && ENV['APPLE_API_KEY_PATH']
|
||||
UI.message("Notarizing DMG with Apple...")
|
||||
|
||||
api_key_path = ENV['APPLE_API_KEY_PATH']
|
||||
|
||||
# Submit for notarization
|
||||
sh("xcrun notarytool submit '#{dmg_path}' " \
|
||||
"--key '#{api_key_path}' " \
|
||||
"--key-id '#{ENV['APPLE_API_KEY_ID']}' " \
|
||||
"--issuer '#{ENV['APPLE_API_ISSUER_ID']}' " \
|
||||
"--wait")
|
||||
UI.success("Notarization complete")
|
||||
|
||||
# Staple the ticket to the DMG
|
||||
sh("xcrun stapler staple '#{dmg_path}'")
|
||||
UI.success("Staple complete")
|
||||
elsif ENV['NOTARIZE_APPLE_ID'] && ENV['NOTARIZE_PASSWORD'] && ENV['CATALYST_TEAM_ID']
|
||||
UI.message("Notarizing DMG with Apple ID...")
|
||||
|
||||
sh("xcrun notarytool submit '#{dmg_path}' " \
|
||||
"--apple-id '#{ENV['NOTARIZE_APPLE_ID']}' " \
|
||||
"--password '#{ENV['NOTARIZE_PASSWORD']}' " \
|
||||
"--team-id '#{ENV['CATALYST_TEAM_ID']}' " \
|
||||
"--wait")
|
||||
UI.success("Notarization complete")
|
||||
|
||||
sh("xcrun stapler staple '#{dmg_path}'")
|
||||
UI.success("Staple complete")
|
||||
else
|
||||
UI.important("Skipping notarization — no Apple credentials found (set APPLE_API_KEY_ID/APPLE_API_ISSUER_ID/APPLE_API_KEY_PATH or NOTARIZE_APPLE_ID/NOTARIZE_PASSWORD/CATALYST_TEAM_ID)")
|
||||
end
|
||||
|
||||
# --- Set outputs ---
|
||||
ENV['CATALYST_APP_PATH'] = catalyst_app_path
|
||||
ENV['CATALYST_ZIP_PATH'] = zip_path
|
||||
ENV['CATALYST_DMG_PATH'] = dmg_path
|
||||
if ENV['GITHUB_OUTPUT']
|
||||
sh("echo 'catalyst_app_path=#{catalyst_app_path}' >> $GITHUB_OUTPUT")
|
||||
sh("echo 'catalyst_zip_path=#{zip_path}' >> $GITHUB_OUTPUT")
|
||||
sh("echo 'catalyst_dmg_path=#{dmg_path}' >> $GITHUB_OUTPUT")
|
||||
end
|
||||
|
||||
UI.success("Mac Catalyst app built at: #{catalyst_app_path}")
|
||||
UI.success("Mac Catalyst zip created at: #{zip_path}")
|
||||
UI.success("Mac Catalyst DMG at: #{dmg_path}")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user