Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into chore/loading-indicator-when-active-model

Browse Source
This commit is contained in:
Faisal Amir 2023-10-25 00:50:37 +07:00 committed by GitHub
commit e468a1d08b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/jan-electron-build.yml vendored
View File

@ -44,7 +44,8 @@ jobs:
CODE_SIGN_P12_BASE64: ${{ secrets.CODE_SIGN_P12_BASE64 }} CODE_SIGN_P12_BASE64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
- uses: apple-actions/import-codesign-certs@v2 - uses: apple-actions/import-codesign-certs@v2
with: continue-on-error: true
with:
p12-file-base64: ${{ secrets.CODE_SIGN_P12_BASE64 }} p12-file-base64: ${{ secrets.CODE_SIGN_P12_BASE64 }}
p12-password: ${{ secrets.CODE_SIGN_P12_PASSWORD }} p12-password: ${{ secrets.CODE_SIGN_P12_PASSWORD }}

2
.github/workflows/jan-plugins.yml vendored
View File

@ -15,7 +15,7 @@ on:
- "!plugins/*/package.json" - "!plugins/*/package.json"
jobs: jobs:
build: build:
runs-on: mac-silicon runs-on: macos-silicon
environment: production environment: production
outputs: outputs:
branch_name: ${{ steps.commit_and_tag.outputs.branch_name }} branch_name: ${{ steps.commit_and_tag.outputs.branch_name }}