Fix error bin file macos (#819)

Co-authored-by: Service Account <service@jan.ai>

Author: hiento09

.github/workflows/cortex-build.yml

@@ -303,12 +303,6 @@ jobs:
           cd cortex-cpp
           make run-e2e-test RUN_TESTS=true LLM_MODEL_URL=${{ env.LLM_MODEL_URL }} EMBEDDING_MODEL_URL=${{ env.EMBEDDING_MODEL_URL }}
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: cortex-cpp-${{ matrix.os }}-${{ matrix.name }}
-          path: ./cortex-cpp/cortex-cpp
-
       - uses: actions/upload-release-asset@v1.0.1
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
         env:
@@ -352,7 +346,7 @@ jobs:
 
           - os: "mac"
             name: "arm64"
-            runs-on: "macos-latest"
+            runs-on: "macos-silicon"
     steps:
       - name: Clone
         id: checkout
@@ -410,6 +404,7 @@ jobs:
           CODE_SIGN_P12_BASE64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
 
       - uses: apple-actions/import-codesign-certs@v2
+        continue-on-error: true
         if: runner.os == 'macOS'
         with:
           p12-file-base64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
@@ -420,18 +415,33 @@ jobs:
           cd cortex-js
           make update-app-info
 
+      - name: copy bin file macos
+        if: runner.os == 'macOS'
+        run: |
+          cd cortex-js
+          mkdir -p installer
+          which cp
+          which mv
+          npm install -g cpx
+          npx cpx ./dist/cortexso-macos ./
+          mv cortexso-macos cortex
+
       - name: Code Signing macOS
         if: runner.os == 'macOS'
         run: |
           cd cortex-js
+          ./dist/cortexso-macos --help
+          echo "--------"
+          ./cortex --help
           make codesign-binary CODE_SIGN=true DEVELOPER_ID="${{ secrets.DEVELOPER_ID }}"
 
       - name: Create MacOS PKG Installer
         if: runner.os == 'macOS'
         run: |
           cd cortex-js
-          mkdir installer
-          cp cortex installer/cortex
+          echo "--------"
+          npx cpx ./cortex ./installer
+          ./installer/cortex --help
           pkgbuild --identifier ai.cortex.pkg --install-location ./usr/local/bin/ --root ./installer cortex-installer.pkg
           make codesign-installer CODE_SIGN=true DEVELOPER_ID="${{ secrets.DEVELOPER_ID }}"
 
@@ -485,38 +495,6 @@ jobs:
           cd cortex-js
           make postbundle
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: cortex-${{ matrix.os }}-${{ matrix.name }}
-          path: |
-            ./cortex-js/cortex
-            ./cortex-js/cortex.exe
-
-      - name: Upload Windows Installer
-        if: runner.os == 'Windows'
-        uses: actions/upload-artifact@v2
-        with:
-          name: cortex-installer-${{ matrix.os }}-${{ matrix.name }}
-          path: |
-            ./cortex-js/setup.exe
-
-      - name: Upload Linux Installer
-        if: runner.os == 'Linux'
-        uses: actions/upload-artifact@v2
-        with:
-          name: cortex-installer-${{ matrix.os }}-${{ matrix.name }}
-          path: |
-            ./cortex-js/cortexso.deb
-      
-      - name: Upload MacOS Installer
-        if: runner.os == 'macOS'
-        uses: actions/upload-artifact@v2
-        with:
-          name: cortex-installer-${{ matrix.os }}-${{ matrix.name }}
-          path: |
-            ./cortex-js/cortex-installer.pkg
-
       - name: Upload Cortex Installer
         uses: actions/upload-release-asset@v1.0.1
         if: runner.os != 'Linux'

cortex-js/Makefile

@@ -14,8 +14,6 @@ ifeq ($(OS),Windows_NT)
 	@powershell -Command 'npx resedit --in $(CORTEX_EXE_IN) --out $(CORTEX_EXE_OUT) --icon "1,cortex.ico" --no-grow --company-name "Homebrew Computer Pte Ltd" --file-description "cortex cli" --file-version "$(CORTEX_VERSION)" --internal-name "cortex" --product-name "cortex" --product-version "$(CORTEX_VERSION)"'
 else ifeq ($(shell uname -s),Linux)
 	@cp ./dist/cortexso-linux ./cortex
-else
-	@cp ./dist/cortexso-macos ./cortex
 endif
 
 codesign-binary:
@@ -59,10 +57,10 @@ ifeq ($(OS),Windows_NT)
 	@powershell -Command "7z a -ttar temp.tar cortex.exe; 7z a -tgzip cortex.tar.gz temp.tar;"
 	@powershell -Command "7z a -ttar temp2.tar setup.exe; 7z a -tgzip cortex-installer.tar.gz temp2.tar;"
 else ifeq ($(shell uname -s),Linux)
-	@chmod +x cortex;
+	@chmod +x cortex; \
 	tar -czvf cortex.tar.gz cortex;
 else
-	@chmod +x cortex;
-	tar -czvf cortex.tar.gz cortex;
+	@chmod +x cortex; \
+	tar -czvf cortex.tar.gz cortex; \
 	tar -czvf cortex-installer.tar.gz cortex-installer.pkg;
 endif

cortex-js/package.json

@@ -12,7 +12,7 @@
     "dev": "nest dev",
     "compile": "npx ncc build ./dist/src/command.js -o command",
     "build": "nest build",
-    "build:binary": "yarn build && yarn compile && npx -q patch-package && npx @yao-pkg/pkg .",
+    "build:binary": "yarn build && yarn compile && npx -q patch-package && npx @yao-pkg/pkg . --options 'max-old-space-size=30720,tls-min-v1.0,expose-gc'",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "build:extensions": "run-script-os",
     "build:extensions:windows": "powershell -command \"$jobs = Get-ChildItem -Path './src/extensions' -Directory | ForEach-Object { Start-Job -Name ($_.Name) -ScriptBlock { param($_dir); try { Set-Location $_dir; yarn; yarn build; Write-Output 'Build successful in ' + $_dir } catch { Write-Error 'Error in ' + $_dir; throw } } -ArgumentList $_.FullName }; $jobs | Wait-Job; $jobs | ForEach-Object { Receive-Job -Job $_ -Keep } | ForEach-Object { Write-Host $_ }; $failed = $jobs | Where-Object { $_.State -ne 'Completed' -or $_.ChildJobs[0].JobStateInfo.State -ne 'Completed' }; if ($failed) { Exit 1 }\"",