Update CICD and makefile

janhq · Jul 3, 2024 · 3d85695 · 3d85695
1 parent 7ebeee4
commit 3d85695
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 16 deletions.
diff --git a/.github/workflows/cortex-build.yml b/.github/workflows/cortex-build.yml
@@ -449,7 +449,7 @@ jobs:
           command: |
             cd cortex-js
             set PATH=%PATH%;%USERPROFILE%\.dotnet\tools
-            make codesign CODE_SIGN=true AZURE_KEY_VAULT_URI="${{ secrets.AZURE_KEY_VAULT_URI }}" AZURE_CLIENT_ID="${{ secrets.AZURE_CLIENT_ID }}" AZURE_TENANT_ID="${{ secrets.AZURE_TENANT_ID }}" AZURE_CLIENT_SECRET="${{ secrets.AZURE_CLIENT_SECRET }}" AZURE_CERT_NAME="${{ secrets.AZURE_CERT_NAME }}"
+            make codesign-installer CODE_SIGN=true CORTEX_VERSION="0.${{ needs.create-draft-release.outputs.version }}" AZURE_KEY_VAULT_URI="${{ secrets.AZURE_KEY_VAULT_URI }}" AZURE_CLIENT_ID="${{ secrets.AZURE_CLIENT_ID }}" AZURE_TENANT_ID="${{ secrets.AZURE_TENANT_ID }}" AZURE_CLIENT_SECRET="${{ secrets.AZURE_CLIENT_SECRET }}" AZURE_CERT_NAME="${{ secrets.AZURE_CERT_NAME }}"
         name: Code Signing Windows
         if: runner.os == 'Windows'
 

diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ dist
 *.lock
 node_modules
 .turbo
+package-lock.json
 
 # CI - Test - Coverage
 cortex.log

diff --git a/cortex-js/Makefile b/cortex-js/Makefile
@@ -5,38 +5,64 @@ AZURE_TENANT_ID ?= xxxx
 AZURE_CLIENT_SECRET ?= xxxx
 AZURE_CERT_NAME ?= xxxx
 DEVELOPER_ID ?= xxxx
+CORTEX_EXE_IN ?= "dist/cortexso-win.exe"
+CORTEX_EXE_OUT ?= "cortex.exe"
+CORTEX_VERSION ?= "0.0.0.1"
 
-postbundle:
-ifeq ($(RUN_TESTS),false)
-	@echo "Skipping tests"
+update-app-info:
+ifeq ($(OS),Windows_NT)
+	@powershell -Command 'npx resedit --in $(CORTEX_EXE_IN) --out $(CORTEX_EXE_OUT) --icon "1,favicon.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: update-app-info
+ifeq ($(CODE_SIGN),false)
+	@echo "Skipping Code Sign"
 	@exit 0
 endif
+
 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;"
+	@powershell -Command "dotnet tool install --global AzureSignTool;"
+	@powershell -Command 'azuresigntool.exe sign -kvu "$(AZURE_KEY_VAULT_URI)" -kvi "$(AZURE_CLIENT_ID)" -kvt "$(AZURE_TENANT_ID)" -kvs "$(AZURE_CLIENT_SECRET)" -kvc "$(AZURE_CERT_NAME)" -tr http://timestamp.globalsign.com/tsa/r6advanced1 -v ".\cortex-js\cortex.exe";'
 else ifeq ($(shell uname -s),Linux)
-	@chmod +x cortex;
-	tar -czvf cortex.tar.gz cortex;
+	@echo "Skipping Code Sign for linux"
+	@exit 0
 else
-	@chmod +x cortex;
-	tar -czvf cortex.tar.gz cortex;
-	tar -czvf cortex-installer.tar.gz cortex-installer.pkg;
+	find "cortex" -type f -exec codesign --force -s "$(DEVELOPER_ID)" --options=runtime {} \;
 endif
 
-
-codesign:
+codesign-installer: codesign-binary
 ifeq ($(CODE_SIGN),false)
 	@echo "Skipping Code Sign"
 	@exit 0
 endif
 
 ifeq ($(OS),Windows_NT)
 	@powershell -Command "dotnet tool install --global AzureSignTool;"
-	@powershell -Command 'azuresigntool.exe sign -kvu "$(AZURE_KEY_VAULT_URI)" -kvi "$(AZURE_CLIENT_ID)" -kvt "$(AZURE_TENANT_ID)" -kvs "$(AZURE_CLIENT_SECRET)" -kvc "$(AZURE_CERT_NAME)" -tr http://timestamp.globalsign.com/tsa/r6advanced1 -v ".\cortex-js\cortex.exe";'
 	@powershell -Command 'azuresigntool.exe sign -kvu "$(AZURE_KEY_VAULT_URI)" -kvi "$(AZURE_CLIENT_ID)" -kvt "$(AZURE_TENANT_ID)" -kvs "$(AZURE_CLIENT_SECRET)" -kvc "$(AZURE_CERT_NAME)" -tr http://timestamp.globalsign.com/tsa/r6advanced1 -v ".\cortex-js\setup.exe";'
 else ifeq ($(shell uname -s),Linux)
 	@echo "Skipping Code Sign for linux"
 	@exit 0
 else
 	find "cortex" -type f -exec codesign --force -s "$(DEVELOPER_ID)" --options=runtime {} \;
+endif
+
+postbundle:
+ifeq ($(RUN_TESTS),false)
+	@echo "Skipping tests"
+	@exit 0
+endif
+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;
+	tar -czvf cortex.tar.gz cortex;
+else
+	@chmod +x cortex;
+	tar -czvf cortex.tar.gz cortex;
+	tar -czvf cortex-installer.tar.gz cortex-installer.pkg;
 endif
diff --git a/cortex-js/installer.iss b/cortex-js/installer.iss
@@ -26,7 +26,6 @@ Name: "{group}\Cortex"; Filename: "{app}\cortex.exe"
 ; Define the run section to execute the application after installation
 [Run]
 Filename: "cmd"; Parameters: "/c setx PATH ""%PATH%;{app}"""; StatusMsg: "Updating system PATH environment variable..."; Flags: runhidden
-Filename: "cmd"; Parameters: "/c cortex init"; StatusMsg: "Initializing Cortex..."; Flags: runhidden waituntilterminated
 Filename: "{app}\cortex.exe"; Description: "{cm:LaunchProgram,Cortex}"; Flags: nowait postinstall skipifsilent
 
 ; Define the tasks section (optional, for additional tasks like creating desktop icons)

diff --git a/cortex-js/package.json b/cortex-js/package.json
@@ -101,7 +101,10 @@
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.3",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.3",
+    "patch-package": "^8.0.0",
+    "@yao-pkg/pkg": "^5.12.0",
+    "resedit-cli": "^2.0.0"
   },
   "resolutions": {
     "ajv": "8.15.0",