diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 347b2108f..63274455b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,8 +29,8 @@ jobs: - run: pnpm prepare:remove-source-maps - run: pnpm package:macos --publish=never -c.mac.identity=null env: - CSC_LINK: ${{ secrets.mac_certs }} - CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }} + CSC_LINK: ${{ secrets.CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} - name: Clean up builds run: rm -rfv dist/mac-universal diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 151c076e1..e83eeab55 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,17 +28,17 @@ jobs: - run: pnpm install - run: pnpm build env: - OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} - OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} + OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }} + OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }} - run: pnpm prepare:remove-source-maps - run: pnpm package:macos --publish onTagOrDraft env: - APPLEID_USERNAME: ${{ secrets.appleid_username }} - APPLEID_PASSWORD: ${{ secrets.appleid_password }} - APPLEID_TEAM_ID: ${{ secrets.appleid_teamid }} - CSC_LINK: ${{ secrets.mac_certs }} - CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }} - GH_TOKEN: ${{ secrets.github_token }} + APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + APPLE_ID_TEAM_ID: ${{ secrets.APPLE_ID_TEAM_ID }} + CSC_LINK: ${{ secrets.CSC_LINK }} + CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} NOTARIZE: true - name: Upload artifacts @@ -68,12 +68,12 @@ jobs: - run: pnpm install - run: pnpm build env: - OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} - OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} + OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }} + OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }} - run: pnpm prepare:remove-source-maps - run: pnpm package:win --publish onTagOrDraft env: - GH_TOKEN: ${{ secrets.github_token }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload artifacts uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 @@ -102,12 +102,12 @@ jobs: - run: pnpm install - run: pnpm build env: - OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} - OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} + OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }} + OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }} - run: pnpm prepare:remove-source-maps - run: pnpm package:linux --publish onTagOrDraft env: - GH_TOKEN: ${{ secrets.github_token }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload artifacts uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 diff --git a/package.json b/package.json index eacca4904..b0b8dfd53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gitify", - "version": "6.1.0", + "version": "6.2.0", "description": "GitHub notifications on your menu bar.", "main": "build/main.js", "scripts": { @@ -40,8 +40,8 @@ "tray" ], "author": { - "name": "Emmanouil Konstantinidis", - "email": "hello@manos.im" + "name": "Adam Setch", + "url": "https://github.com/setchy" }, "contributors": [ { @@ -89,7 +89,7 @@ "mac": { "category": "public.app-category.developer-tools", "icon": "assets/images/app-icon.icns", - "identity": "Emmanouil Konstantinidis (3YP8SXP3BF)", + "identity": "Adam Setch (5KD23H9729)", "type": "distribution", "notarize": false, "target": { diff --git a/scripts/notarize.js b/scripts/notarize.js index f8635385d..8c6b76b65 100644 --- a/scripts/notarize.js +++ b/scripts/notarize.js @@ -30,9 +30,9 @@ const notarizeApp = async (context) => { return await notarize({ appBundleId, appPath: `${appOutDir}/${appName}.app`, - appleId: process.env.APPLEID_USERNAME, - appleIdPassword: process.env.APPLEID_PASSWORD, - teamId: process.env.APPLEID_TEAM_ID, + appleId: process.env.APPLE_ID_USERNAME, + appleIdPassword: process.env.APPLE_ID_PASSWORD, + teamId: process.env.APPLE_ID_TEAM_ID, tool: 'notarytool', }); };