From f3b1540369e9f78a58d5cf741d038930ade02dbe Mon Sep 17 00:00:00 2001 From: Hien To Date: Sun, 16 Jun 2024 14:08:33 +0700 Subject: [PATCH 1/2] Fix nightly CI run failed --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 93c634981..e20d44459 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -51,7 +51,7 @@ jobs: echo "Updated version from $current_version to $latest_prerelease_name." echo "::set-output name=pr_created::true" cd - - git add $engine_cmake_path + git add cortex-cpp/$engine_cmake_path git commit -m "Update cortex.llamacpp nightly to version $latest_prerelease_name" branch_name="update-nightly-$(date +'%Y-%m-%d-%H-%M')" git checkout -b $branch_name From 7ea40d30bca79a9d6c3fc2e617e2d7ff0c7fb6db Mon Sep 17 00:00:00 2001 From: Hien To Date: Sun, 16 Jun 2024 17:23:05 +0700 Subject: [PATCH 2/2] Add retry 3 times for codesign on windows --- .github/workflows/cortex-cpp-build.yml | 17 ++++++++++------- .github/workflows/nightly-build.yml | 18 +++++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cortex-cpp-build.yml b/.github/workflows/cortex-cpp-build.yml index 7be4d2e7f..e2a12b2b6 100644 --- a/.github/workflows/cortex-cpp-build.yml +++ b/.github/workflows/cortex-cpp-build.yml @@ -200,14 +200,17 @@ jobs: cd cortex-cpp make codesign CODE_SIGN=true DEVELOPER_ID="${{ secrets.DEVELOPER_ID }}" - - name: Code Signing Windows + - uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 10 + timeout_minutes: 10 + max_attempts: 3 + command: | + cd cortex-cpp + 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 }}" + name: Code Signing Windows if: runner.os == 'Windows' - shell: cmd - run: | - cd cortex-cpp - 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 }}" - - name: Package run: | diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 1289e61d7..d04b76146 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -201,14 +201,18 @@ jobs: cd cortex-cpp make codesign CODE_SIGN=true DEVELOPER_ID="${{ secrets.DEVELOPER_ID }}" - - name: Code Signing Windows + - uses: nick-fields/retry@v3 + with: + continue_on_error: true + retry_wait_seconds: 10 + timeout_minutes: 10 + max_attempts: 3 + command: | + cd cortex-cpp + 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 }}" + name: Code Signing Windows if: runner.os == 'Windows' - shell: cmd - run: | - cd cortex-cpp - 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 }}" - - name: Package run: |