Skip to content

Commit

Permalink
[fix] fix release.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
minskiter committed Apr 30, 2024
1 parent 3327cb6 commit ffcb733
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 22 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# This workflow contains a single job called "build"
window:
# The type of runner that the job will run on
runs-on: windows-latest
runs-on: windows-2022

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -27,7 +27,7 @@ jobs:
# Uses NodeJs Environment
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16
registry-url: https://registry.npmjs.org/
cache: "yarn"

Expand Down Expand Up @@ -69,21 +69,24 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

macos:
runs-on: macos-latest
runs-on: macos-14
env:
USE_HARD_LINKS: false
CSC_LINK: ~/app.p12
P12: ${{ secrets.APP_P12 }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
APP_ID: ${{ secrets.APP_ID }}
TEAM_ID: ${{ secrets.TEAM_ID }}

steps:
- uses: actions/checkout@v2

# Uses NodeJs Environment
- uses: actions/setup-node@v1
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16
registry-url: https://registry.npmjs.org/
cache: "yarn"

Expand All @@ -92,7 +95,7 @@ jobs:
cat > ~/app.p12.base64 << EOF
$P12
EOF
base64 -d ~/app.p12.base64 -o ~/app.p12
base64 -D -i ~/app.p12.base64 -o ~/app.p12
- name: install dependencies
run: yarn install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@creatorsn/fabulous",
"version": "3.6.2",
"version": "3.6.3",
"private": true,
"description": "Fabulous Notebook is a WYSIWYG notebook with an exciting paper and literature management system.",
"author": {
Expand Down
32 changes: 18 additions & 14 deletions scripts/notarize.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
const { notarize } = require('electron-notarize');
exports.default = async function notarizing(context) {
const { electronPlatformName, appOutDir } = context;
const { notarize } = require('electron-notarize')

exports.default = async function notarizing (context) {
const { electronPlatformName, appOutDir } = context
if (electronPlatformName !== 'darwin') {
return;
return
}

const appName = context.packager.appInfo.productFilename;


const appName = context.packager.appInfo.productFilename
const appId = process.env.APP_ID
const appleId = process.env.APPLE_ID
const applePassword = process.env.APPLE_PASSWORD
const teamId = process.env.TEAM_ID

return await notarize({
appBundleId: 'com.creatorsn.fabulous',
appBundleId: appId,
appPath: `${appOutDir}/${appName}.app`,
appleId: process.env.APPLE_ID,
appleIdPassword: process.env.APPLE_PASSWORD,
});
}

appleId: appleId,
appleIdPassword: applePassword,
teamId: teamId
})
}
7 changes: 6 additions & 1 deletion vue.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const { app } = require("electron");
var path = require("path");

const resolve = url => {
Expand Down Expand Up @@ -41,9 +42,13 @@ module.exports = {
createDesktopShortcut: true,
createStartMenuShortcut: true
},
afterSign: 'notarize.js',
asar: false,
dmg:{
sign: false
},
mac: {
icon: './logo.icns',

fileAssociations: [
{
name: "Fabulous Notebook File",
Expand Down

0 comments on commit ffcb733

Please sign in to comment.