Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: janhq/cortex.cpp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3c9aa62c940294f06cead7ff6456189ff7bb95c6
Choose a base ref
..
head repository: janhq/cortex.cpp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1038088cab25a99c9031be4394781ba6b63d7ba5
Choose a head ref
Showing with 9 additions and 6 deletions.
  1. +7 −6 .github/workflows/nightly-build.yml
  2. +2 −0 engine/Makefile
13 changes: 7 additions & 6 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
@@ -100,16 +100,17 @@ jobs:
p12-file-base64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
p12-password: ${{ secrets.CODE_SIGN_P12_PASSWORD }}

- name: Install choco on Windows
if: runner.os == 'Windows'
run: |
choco install make pkgconfiglite ccache awscli 7zip ninja -y
- uses: actions/setup-dotnet@v3
if: runner.os == 'Windows'
with:
dotnet-version: "8.0.x"

- name: Install choco on Windows
if: runner.os == 'Windows'
run: |
choco install make pkgconfiglite ccache awscli 7zip ninja -y
dotnet tool install --global AzureSignTool
- name: Download ccache from s3
if: runner.os == 'Windows'
continue-on-error: true
@@ -180,7 +181,7 @@ jobs:
if: runner.os == 'Windows'
run: |
cd engine
dotnet tool install --global AzureSignTool
set PATH=%PATH%;%USERPROFILE%\.dotnet\tools
azuresigntool.exe sign -kvu ${{ secrets.AZURE_KEY_VAULT_URI }} -kvi ${{ secrets.AZURE_CLIENT_ID }} -kvt ${{ secrets.AZURE_TENANT_ID }} -kvs ${{ secrets.AZURE_CLIENT_SECRET }} -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.globalsign.com/tsa/r6advanced1 -v ".\templates\windows\setup.exe";'
2 changes: 2 additions & 0 deletions engine/Makefile
Original file line number Diff line number Diff line change
@@ -101,11 +101,13 @@ ifeq ($(OS),Windows_NT)
else ifeq ($(shell uname -s),Linux)
@echo "Building installer for linux"; \
cd templates/linux; \
chmod +x create_deb.sh; \
./create_deb.sh $(PACKAGE_NAME) $(VERSION) $(SOURCE_BINARY_PATH) $(DESTINATION_BINARY_NAME) $(DATA_FOLDER_NAME) $(CONFIGURATION_FILE_NAME);
cp $(PACKAGE_NAME).deb ../../
else
@echo "Building installer for linux"; \
cd templates/macos; \
chmod +x create_pkg.sh; \
./create_pkg.sh $(PACKAGE_NAME) $(VERSION) $(SOURCE_BINARY_PATH) $(DESTINATION_BINARY_NAME) $(DATA_FOLDER_NAME) $(CONFIGURATION_FILE_NAME) $(UNINSTALLER_FILE_NAME);
cp $(PACKAGE_NAME).pkg ../../
endif