diff --git a/.github/actions/validate-build/action.yml b/.github/actions/validate-build/action.yml index 7618c39617..733543f477 100644 --- a/.github/actions/validate-build/action.yml +++ b/.github/actions/validate-build/action.yml @@ -9,18 +9,21 @@ runs: run: | SDK_KDF_ASSETS_DIR=build/web/assets/packages/komodo_defi_framework - # Check that the web build folder contains a wasm file in the format build/web/kdf/*.wasm - if [ ! -f build/web/kdf/kdf/bin/*.wasm ]; then + # Check that the web build folder contains a wasm file in the format build/web/kdf/kdf/bin/*.wasm + shopt -s nullglob + wasm_files=(build/web/kdf/kdf/bin/*.wasm) + if [ ${#wasm_files[@]} -eq 0 ]; then echo "Error: Web build failed. No wasm file found in build/web/kdf/kdf/bin" # List files for debugging - echo "Listing files in build/web recursively" - ls -R build/web + echo "Listing files in build/web/kdf recursively" + ls -R build/web/kdf 2>/dev/null || echo "build/web/kdf directory does not exist" - echo "Listing files in web recursively" - ls -R web + echo "Listing files in web/kdf recursively" + ls -R web/kdf 2>/dev/null || echo "web/kdf directory does not exist" exit 1 fi + echo "Found wasm files: ${wasm_files[@]}" # Check that the index.html is present and that it is equal to the source index.html if ! cmp -s web/index.html build/web/index.html; then diff --git a/.github/workflows/desktop-builds.yml b/.github/workflows/desktop-builds.yml index 7cf76d4bcb..3084962c59 100644 --- a/.github/workflows/desktop-builds.yml +++ b/.github/workflows/desktop-builds.yml @@ -48,7 +48,7 @@ jobs: with: p12-file-base64: ${{ secrets.MACOS_P12_BASE64 }} p12-password: ${{ secrets.MACOS_P12_PASSWORD }} - bundle-id: "com.komodo.komodowallet" + bundle-id: "com.komodo.wallet" profile-type: "MAC_APP_DEVELOPMENT" issuer-id: ${{ secrets.APPSTORE_ISSUER_ID }} api-key-id: ${{ secrets.APPSTORE_KEY_ID }} @@ -73,6 +73,10 @@ jobs: - name: Fetch packages, generate assets, and build for ${{ matrix.platform }} env: GITHUB_API_PUBLIC_READONLY_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Disable code signing for macOS PR builds + CODE_SIGNING_ALLOWED: ${{ matrix.platform == 'macos' && github.event_name == 'pull_request' && 'NO' || '' }} + CODE_SIGNING_REQUIRED: ${{ matrix.platform == 'macos' && github.event_name == 'pull_request' && 'NO' || '' }} + EXPANDED_CODE_SIGN_IDENTITY: ${{ matrix.platform == 'macos' && github.event_name == 'pull_request' && '-' || '' }} uses: ./.github/actions/generate-assets with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index d40a175d03..f8f9a9994d 100644 --- a/.gitignore +++ b/.gitignore @@ -83,4 +83,7 @@ venv/ /macos/build AGENTS_1.md # .dmg Release -dist/ \ No newline at end of file +dist/ + +# KDF generated binaries +web/kdf/kdf/bin/ \ No newline at end of file diff --git a/sdk b/sdk index 0cdff3c3d8..61a417068c 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 0cdff3c3d83c3b8f523297cc0283627cca7c4445 +Subproject commit 61a417068c27b8757fd1fe4cf71b35c241aaf1b4 diff --git a/test_integration/runners/app_data.dart b/test_integration/runners/app_data.dart index 8b5cae157f..2603dd4bde 100644 --- a/test_integration/runners/app_data.dart +++ b/test_integration/runners/app_data.dart @@ -3,7 +3,7 @@ import 'dart:io'; //app data path for mac and linux -const String macAppData = '/Library/Containers/com.komodo.komodowallet'; +const String macAppData = '/Library/Containers/com.komodo.wallet'; const String linuxAppData = '/.local/share/com.komodo.KomodoWallet'; const String windowsAppData = r'\AppData\Roaming\com.komodo';