Skip to content

Commit

Permalink
Merge branch 'main' into chore/loading-indicator-when-active-model
Browse files Browse the repository at this point in the history
  • Loading branch information
urmauur authored Oct 24, 2023
2 parents bd72e43 + 3237efe commit e468a1d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/jan-electron-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ jobs:
CODE_SIGN_P12_BASE64: ${{ secrets.CODE_SIGN_P12_BASE64 }}

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jan-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- "!plugins/*/package.json"
jobs:
build:
runs-on: mac-silicon
runs-on: macos-silicon
environment: production
outputs:
branch_name: ${{ steps.commit_and_tag.outputs.branch_name }}
Expand Down

0 comments on commit e468a1d

Please sign in to comment.