From 5bb68d7740a5f5d4d533db76fdee602773b991f5 Mon Sep 17 00:00:00 2001 From: Louis Le Date: Thu, 8 Aug 2024 16:37:24 +0700 Subject: [PATCH 1/2] fix: binary file lookup --- .github/workflows/cortex-build.yml | 6 +++--- cortex-js/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cortex-build.yml b/.github/workflows/cortex-build.yml index 44a25b6c5..572492743 100644 --- a/.github/workflows/cortex-build.yml +++ b/.github/workflows/cortex-build.yml @@ -322,14 +322,14 @@ jobs: which cp which mv npm install -g cpx - npx cpx ./dist/cortexso-macos ./ - mv cortexso-macos cortex + npx cpx ./dist/cortexso ./ + mv cortexso cortex - name: Code Signing macOS if: runner.os == 'macOS' run: | cd cortex-js - ./dist/cortexso-macos --help + ./dist/cortexso --help echo "--------" ./cortex --help make codesign-binary CODE_SIGN=true DEVELOPER_ID="${{ secrets.DEVELOPER_ID }}" diff --git a/cortex-js/Makefile b/cortex-js/Makefile index 798d55a1a..2d9d7bcec 100644 --- a/cortex-js/Makefile +++ b/cortex-js/Makefile @@ -5,7 +5,7 @@ AZURE_TENANT_ID ?= xxxx AZURE_CLIENT_SECRET ?= xxxx AZURE_CERT_NAME ?= xxxx DEVELOPER_ID ?= xxxx -CORTEX_EXE_IN ?= "dist/cortexso-win.exe" +CORTEX_EXE_IN ?= "dist/cortexso.exe" CORTEX_EXE_OUT ?= "cortex.exe" CORTEX_VERSION ?= "0.0.0.1" @@ -13,7 +13,7 @@ update-app-info: 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 + @cp ./dist/cortexso ./cortex endif codesign-binary: From 0bbcf7f65c1de685b02acebbec0454fef33042f8 Mon Sep 17 00:00:00 2001 From: Hien To Date: Thu, 8 Aug 2024 16:52:28 +0700 Subject: [PATCH 2/2] Build linux binary uses selfhosted runner --- .github/workflows/cortex-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cortex-build.yml b/.github/workflows/cortex-build.yml index 572492743..182e445d9 100644 --- a/.github/workflows/cortex-build.yml +++ b/.github/workflows/cortex-build.yml @@ -233,7 +233,7 @@ jobs: include: - os: "linux" name: "amd64" - runs-on: "ubuntu-latest" + runs-on: "ubuntu-20-04" - os: "windows" name: "amd64"