From 65e0fea610b0e092761eda6542bbcbef6db03cb2 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 17:25:34 -0400 Subject: [PATCH 01/14] Add GitHub actions CI scripts --- .github/workflows/ci/linux.yml | 21 +++++++++++++++++++++ .github/workflows/ci/mac.yml | 21 +++++++++++++++++++++ .github/workflows/ci/standard.yml | 26 ++++++++++++++++++++++++++ .github/workflows/ci/win.yml | 21 +++++++++++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 .github/workflows/ci/linux.yml create mode 100644 .github/workflows/ci/mac.yml create mode 100644 .github/workflows/ci/standard.yml create mode 100644 .github/workflows/ci/win.yml diff --git a/.github/workflows/ci/linux.yml b/.github/workflows/ci/linux.yml new file mode 100644 index 0000000..837256f --- /dev/null +++ b/.github/workflows/ci/linux.yml @@ -0,0 +1,21 @@ +name: Build Linux Client + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Clone source code + uses: actions/checkout@v1 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: 10.x + - name: Install dependencies and build + run: | + npm install + npm run build --if-present + npm run build-desktop-linux \ No newline at end of file diff --git a/.github/workflows/ci/mac.yml b/.github/workflows/ci/mac.yml new file mode 100644 index 0000000..83da9c2 --- /dev/null +++ b/.github/workflows/ci/mac.yml @@ -0,0 +1,21 @@ +name: Build macOS Client + +on: [push, pull_request] + +jobs: + build: + + runs-on: macos-latest + + steps: + - name: Clone source code + uses: actions/checkout@v1 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: 10.x + - name: Install dependencies and build + run: | + npm install + npm run build --if-present + npm run build-desktop-darwin-nosign \ No newline at end of file diff --git a/.github/workflows/ci/standard.yml b/.github/workflows/ci/standard.yml new file mode 100644 index 0000000..9a21f54 --- /dev/null +++ b/.github/workflows/ci/standard.yml @@ -0,0 +1,26 @@ +name: Node CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [8.x, 10.x, 12.x] + + steps: + - name: Clone source code + uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies and build + run: | + npm install + npm run build --if-present + env: + CI: true \ No newline at end of file diff --git a/.github/workflows/ci/win.yml b/.github/workflows/ci/win.yml new file mode 100644 index 0000000..c884272 --- /dev/null +++ b/.github/workflows/ci/win.yml @@ -0,0 +1,21 @@ +name: Build Windows Client + +on: [push, pull_request] + +jobs: + build: + + runs-on: windows-latest + + steps: + - name: Clone source code + uses: actions/checkout@v1 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: 10.x + - name: Install dependencies and build + run: | + npm install + npm run build --if-present + npm run build-desktop-win \ No newline at end of file From 298827d13c1d8f91b1fc17be63b538d5999a127e Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 17:27:09 -0400 Subject: [PATCH 02/14] Move CI scripts out of CI dir --- .github/workflows/ci/linux.yml | 21 --------------------- .github/workflows/ci/mac.yml | 21 --------------------- .github/workflows/ci/standard.yml | 26 -------------------------- .github/workflows/ci/win.yml | 21 --------------------- 4 files changed, 89 deletions(-) delete mode 100644 .github/workflows/ci/linux.yml delete mode 100644 .github/workflows/ci/mac.yml delete mode 100644 .github/workflows/ci/standard.yml delete mode 100644 .github/workflows/ci/win.yml diff --git a/.github/workflows/ci/linux.yml b/.github/workflows/ci/linux.yml deleted file mode 100644 index 837256f..0000000 --- a/.github/workflows/ci/linux.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build Linux Client - -on: [push, pull_request] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - name: Clone source code - uses: actions/checkout@v1 - - name: Use Node.js - uses: actions/setup-node@v1 - with: - node-version: 10.x - - name: Install dependencies and build - run: | - npm install - npm run build --if-present - npm run build-desktop-linux \ No newline at end of file diff --git a/.github/workflows/ci/mac.yml b/.github/workflows/ci/mac.yml deleted file mode 100644 index 83da9c2..0000000 --- a/.github/workflows/ci/mac.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build macOS Client - -on: [push, pull_request] - -jobs: - build: - - runs-on: macos-latest - - steps: - - name: Clone source code - uses: actions/checkout@v1 - - name: Use Node.js - uses: actions/setup-node@v1 - with: - node-version: 10.x - - name: Install dependencies and build - run: | - npm install - npm run build --if-present - npm run build-desktop-darwin-nosign \ No newline at end of file diff --git a/.github/workflows/ci/standard.yml b/.github/workflows/ci/standard.yml deleted file mode 100644 index 9a21f54..0000000 --- a/.github/workflows/ci/standard.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Node CI - -on: [push] - -jobs: - build: - - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [8.x, 10.x, 12.x] - - steps: - - name: Clone source code - uses: actions/checkout@v1 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Install dependencies and build - run: | - npm install - npm run build --if-present - env: - CI: true \ No newline at end of file diff --git a/.github/workflows/ci/win.yml b/.github/workflows/ci/win.yml deleted file mode 100644 index c884272..0000000 --- a/.github/workflows/ci/win.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build Windows Client - -on: [push, pull_request] - -jobs: - build: - - runs-on: windows-latest - - steps: - - name: Clone source code - uses: actions/checkout@v1 - - name: Use Node.js - uses: actions/setup-node@v1 - with: - node-version: 10.x - - name: Install dependencies and build - run: | - npm install - npm run build --if-present - npm run build-desktop-win \ No newline at end of file From c237be57e7baa9555325fcfab480a20ed6ef94f2 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 17:28:15 -0400 Subject: [PATCH 03/14] Upload GitHub Actions scripts --- .github/workflows/ci/ci-linux.yml | 21 +++++++++++++++++++++ .github/workflows/ci/ci-mac.yml | 21 +++++++++++++++++++++ .github/workflows/ci/ci-standard.yml | 26 ++++++++++++++++++++++++++ .github/workflows/ci/ci-win.yml | 21 +++++++++++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 .github/workflows/ci/ci-linux.yml create mode 100644 .github/workflows/ci/ci-mac.yml create mode 100644 .github/workflows/ci/ci-standard.yml create mode 100644 .github/workflows/ci/ci-win.yml diff --git a/.github/workflows/ci/ci-linux.yml b/.github/workflows/ci/ci-linux.yml new file mode 100644 index 0000000..837256f --- /dev/null +++ b/.github/workflows/ci/ci-linux.yml @@ -0,0 +1,21 @@ +name: Build Linux Client + +on: [push, pull_request] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Clone source code + uses: actions/checkout@v1 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: 10.x + - name: Install dependencies and build + run: | + npm install + npm run build --if-present + npm run build-desktop-linux \ No newline at end of file diff --git a/.github/workflows/ci/ci-mac.yml b/.github/workflows/ci/ci-mac.yml new file mode 100644 index 0000000..83da9c2 --- /dev/null +++ b/.github/workflows/ci/ci-mac.yml @@ -0,0 +1,21 @@ +name: Build macOS Client + +on: [push, pull_request] + +jobs: + build: + + runs-on: macos-latest + + steps: + - name: Clone source code + uses: actions/checkout@v1 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: 10.x + - name: Install dependencies and build + run: | + npm install + npm run build --if-present + npm run build-desktop-darwin-nosign \ No newline at end of file diff --git a/.github/workflows/ci/ci-standard.yml b/.github/workflows/ci/ci-standard.yml new file mode 100644 index 0000000..9a21f54 --- /dev/null +++ b/.github/workflows/ci/ci-standard.yml @@ -0,0 +1,26 @@ +name: Node CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [8.x, 10.x, 12.x] + + steps: + - name: Clone source code + uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - name: Install dependencies and build + run: | + npm install + npm run build --if-present + env: + CI: true \ No newline at end of file diff --git a/.github/workflows/ci/ci-win.yml b/.github/workflows/ci/ci-win.yml new file mode 100644 index 0000000..c884272 --- /dev/null +++ b/.github/workflows/ci/ci-win.yml @@ -0,0 +1,21 @@ +name: Build Windows Client + +on: [push, pull_request] + +jobs: + build: + + runs-on: windows-latest + + steps: + - name: Clone source code + uses: actions/checkout@v1 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: 10.x + - name: Install dependencies and build + run: | + npm install + npm run build --if-present + npm run build-desktop-win \ No newline at end of file From 0253ea9670d894cb789b9a09a682c497b65c7c0c Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 17:29:30 -0400 Subject: [PATCH 04/14] Move CI scripts to workflows root --- .github/workflows/{ci => }/ci-linux.yml | 0 .github/workflows/{ci => }/ci-mac.yml | 0 .github/workflows/{ci => }/ci-standard.yml | 0 .github/workflows/{ci => }/ci-win.yml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{ci => }/ci-linux.yml (100%) rename .github/workflows/{ci => }/ci-mac.yml (100%) rename .github/workflows/{ci => }/ci-standard.yml (100%) rename .github/workflows/{ci => }/ci-win.yml (100%) diff --git a/.github/workflows/ci/ci-linux.yml b/.github/workflows/ci-linux.yml similarity index 100% rename from .github/workflows/ci/ci-linux.yml rename to .github/workflows/ci-linux.yml diff --git a/.github/workflows/ci/ci-mac.yml b/.github/workflows/ci-mac.yml similarity index 100% rename from .github/workflows/ci/ci-mac.yml rename to .github/workflows/ci-mac.yml diff --git a/.github/workflows/ci/ci-standard.yml b/.github/workflows/ci-standard.yml similarity index 100% rename from .github/workflows/ci/ci-standard.yml rename to .github/workflows/ci-standard.yml diff --git a/.github/workflows/ci/ci-win.yml b/.github/workflows/ci-win.yml similarity index 100% rename from .github/workflows/ci/ci-win.yml rename to .github/workflows/ci-win.yml From 482dd984bd1268a4fe017456fef336db540c4ee6 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 18:01:40 -0400 Subject: [PATCH 05/14] Test if GitHub actions can handle signing, update README and remove Azure steup --- .azure/build-web.yml | 4 ---- .azure/mac-files.yml | 25 ------------------------- .azure/setup.yml | 9 --------- .github/workflows/ci-mac.yml | 9 +++++++++ README.md | 6 +++--- 5 files changed, 12 insertions(+), 41 deletions(-) delete mode 100644 .azure/build-web.yml delete mode 100644 .azure/mac-files.yml delete mode 100644 .azure/setup.yml diff --git a/.azure/build-web.yml b/.azure/build-web.yml deleted file mode 100644 index 8c7fa48..0000000 --- a/.azure/build-web.yml +++ /dev/null @@ -1,4 +0,0 @@ -steps: - - script: | - npm run build - displayName: 'Build project files' \ No newline at end of file diff --git a/.azure/mac-files.yml b/.azure/mac-files.yml deleted file mode 100644 index 5347773..0000000 --- a/.azure/mac-files.yml +++ /dev/null @@ -1,25 +0,0 @@ -steps: - - task: DownloadSecureFile@1 - inputs: - secureFile: 'embedded.provisionprofile' - displayName: 'Download Mac App Store provisioning profile' - - task: DownloadSecureFile@1 - inputs: - secureFile: 'nonmas.provisionprofile' - displayName: 'Download regular macOS provisioning profile' - - task: DownloadSecureFile@1 - inputs: - secureFile: 'entitlements.mac.plist' - displayName: 'Download regular macOS entitlements' - - task: DownloadSecureFile@1 - inputs: - secureFile: 'entitlements.mas.plist' - displayName: 'Download Mac App Store entitlements' - - task: DownloadSecureFile@1 - inputs: - secureFile: 'info.plist' - displayName: 'Download info.plist' - - script: mv $(Agent.TempDirectory)/*.plist desktop/ - displayName: 'Move entitlements and info to Electron folder' - - script: mv $(Agent.TempDirectory)/*.provisionprofile desktop/ - displayName: 'Move provisioning profiles to Electron folder' \ No newline at end of file diff --git a/.azure/setup.yml b/.azure/setup.yml deleted file mode 100644 index 7494447..0000000 --- a/.azure/setup.yml +++ /dev/null @@ -1,9 +0,0 @@ -steps: -- task: NodeTool@0 - inputs: - versionSpec: '8.x' - displayName: 'Install Node.js' - -- script: | - npm install - displayName: 'Install dependencies' \ No newline at end of file diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml index 83da9c2..2aa644b 100644 --- a/.github/workflows/ci-mac.yml +++ b/.github/workflows/ci-mac.yml @@ -14,6 +14,15 @@ jobs: uses: actions/setup-node@v1 with: node-version: 10.x + - name: Run pre-build setup + run: | + base64 --decode "$(ascCertificates)" > Certificates.p12 + security add-generic-password -a "appleseed@marquiskurt.net" -w "$(ascPassword)" -s "AC_PASSWORD" + security import Certificates.p12 -P "$(ascCertsPassword)" -k /Library/Keychains/System.keychain + with: + ascPassword: ${{ secrets.ASC_PASSWORD }} + ascCertificates: ${{ secrets.ASC_CERTS }} + ascCertsPassword: ${{ secrets.ASC_CERTS_PASSWORD }} - name: Install dependencies and build run: | npm install diff --git a/README.md b/README.md index facacd1..09acc1a 100644 --- a/README.md +++ b/README.md @@ -5,14 +5,14 @@ The new beautiful, fluffy client for the fediverse written in TypeScript and Rea ![Screenshot](screenshot.png) [![Matrix room](https://img.shields.io/matrix/hypermasto:matrix.org.svg)](https://matrix.to/#/#hypermasto:matrix.org) -[![Discord server](https://img.shields.io/discord/554108687434907660.svg?color=blueviolet&label=discord)](https://discord.gg/c69AXwk) -[![Build Status](https://dev.azure.com/hyperspacedev/Hyperspace/_apis/build/status/CI%20Tests?branchName=master)](https://dev.azure.com/hyperspacedev/Hyperspace/_build/latest?definitionId=1&branchName=master) +[![Discord server](https://img.shields.io/discord/554108687434907660.svg?color=blueviolet&label=discord)](https://discord.gg/c69AXwk) +![Build Status](https://github.com/hyperspacedev/hyperspace/workflows/Node%20CI/badge.svg) Hyperspace is the fluffiest client for Mastodon and other fediverse networks written in TypeScript and React. Hyperspace offers a fun, clean, fast, and responsive design that scales beautifully across devices and enhances the fediverse experience. > Note: For more information on how Hyperspace 1.0 is different from the *Hyperspace Classic (0.x)* series, please see [MIGRATING.md](MIGRATING.md). -## Build instrictions +## Build instructions ### Prerequisites From 70e9456d59cca05be0818fd36e24037c9e80254a Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 18:03:08 -0400 Subject: [PATCH 06/14] Change with to env --- .github/workflows/ci-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml index 2aa644b..80f3227 100644 --- a/.github/workflows/ci-mac.yml +++ b/.github/workflows/ci-mac.yml @@ -19,7 +19,7 @@ jobs: base64 --decode "$(ascCertificates)" > Certificates.p12 security add-generic-password -a "appleseed@marquiskurt.net" -w "$(ascPassword)" -s "AC_PASSWORD" security import Certificates.p12 -P "$(ascCertsPassword)" -k /Library/Keychains/System.keychain - with: + env: ascPassword: ${{ secrets.ASC_PASSWORD }} ascCertificates: ${{ secrets.ASC_CERTS }} ascCertsPassword: ${{ secrets.ASC_CERTS_PASSWORD }} From 318e616a51242619e869d58b91dfffba9f892ef7 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 18:05:45 -0400 Subject: [PATCH 07/14] Echo cert to file before decode --- .github/workflows/ci-mac.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml index 80f3227..6cf1ce2 100644 --- a/.github/workflows/ci-mac.yml +++ b/.github/workflows/ci-mac.yml @@ -16,7 +16,8 @@ jobs: node-version: 10.x - name: Run pre-build setup run: | - base64 --decode "$(ascCertificates)" > Certificates.p12 + echo "$(ascCertificates)" > certs.b64 + base64 --decode certs.b64 > Certificates.p12 security add-generic-password -a "appleseed@marquiskurt.net" -w "$(ascPassword)" -s "AC_PASSWORD" security import Certificates.p12 -P "$(ascCertsPassword)" -k /Library/Keychains/System.keychain env: From 7390d42d761afa036aebadf9e882917f335d8584 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 18:08:05 -0400 Subject: [PATCH 08/14] Remove params from var names --- .github/workflows/ci-mac.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml index 6cf1ce2..31646be 100644 --- a/.github/workflows/ci-mac.yml +++ b/.github/workflows/ci-mac.yml @@ -16,10 +16,10 @@ jobs: node-version: 10.x - name: Run pre-build setup run: | - echo "$(ascCertificates)" > certs.b64 + echo "$ascCertificates" > certs.b64 base64 --decode certs.b64 > Certificates.p12 - security add-generic-password -a "appleseed@marquiskurt.net" -w "$(ascPassword)" -s "AC_PASSWORD" - security import Certificates.p12 -P "$(ascCertsPassword)" -k /Library/Keychains/System.keychain + security add-generic-password -a "appleseed@marquiskurt.net" -w "$ascPassword" -s "AC_PASSWORD" + security import Certificates.p12 -P "$ascCertsPassword" -k /Library/Keychains/System.keychain env: ascPassword: ${{ secrets.ASC_PASSWORD }} ascCertificates: ${{ secrets.ASC_CERTS }} From 4715afc9108e197e6d4f629f6ca92b92759ab52b Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 25 Sep 2019 18:09:30 -0400 Subject: [PATCH 09/14] Fucking add the keychain --- .github/workflows/ci-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml index 31646be..9095ab7 100644 --- a/.github/workflows/ci-mac.yml +++ b/.github/workflows/ci-mac.yml @@ -19,7 +19,7 @@ jobs: echo "$ascCertificates" > certs.b64 base64 --decode certs.b64 > Certificates.p12 security add-generic-password -a "appleseed@marquiskurt.net" -w "$ascPassword" -s "AC_PASSWORD" - security import Certificates.p12 -P "$ascCertsPassword" -k /Library/Keychains/System.keychain + sudo security import Certificates.p12 -P "$ascCertsPassword" -k /Library/Keychains/System.keychain env: ascPassword: ${{ secrets.ASC_PASSWORD }} ascCertificates: ${{ secrets.ASC_CERTS }} From c6ae1808a98c4eea3969a3207397b64ed2b7c11e Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Thu, 26 Sep 2019 09:46:28 -0400 Subject: [PATCH 10/14] Test signing and noratization --- .github/workflows/ci-mac.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml index 9095ab7..40a8dd3 100644 --- a/.github/workflows/ci-mac.yml +++ b/.github/workflows/ci-mac.yml @@ -16,16 +16,34 @@ jobs: node-version: 10.x - name: Run pre-build setup run: | + echo "Downloading certificates and profiles..." echo "$ascCertificates" > certs.b64 + echo "$ascMasProfile" > mas.b64 + echo "$ascMacProfile" > mac.b64 + echo "$ascEntitlementsMas" > entmas.b64 + echo "$ascEntitlementsMac" > entmac.b64 + echo "$ascInfoPlist" > info.b64 + + echo "Installing certificates and profiles..." base64 --decode certs.b64 > Certificates.p12 + base64 --decode mas.64 > desktop/embedded.provisionprofile + base64 --decode mac.b64 > desktop/nonmas.provisionprofile + base64 --decode entmas.b64 > desktop/entitlements.mas.plist + base64 --decode entmac.b64 > desktop/entitlements.mac.plist + base64 --decode info.b64 > desktop/info.plist security add-generic-password -a "appleseed@marquiskurt.net" -w "$ascPassword" -s "AC_PASSWORD" sudo security import Certificates.p12 -P "$ascCertsPassword" -k /Library/Keychains/System.keychain env: ascPassword: ${{ secrets.ASC_PASSWORD }} ascCertificates: ${{ secrets.ASC_CERTS }} ascCertsPassword: ${{ secrets.ASC_CERTS_PASSWORD }} + ascMacProfile: ${{ secrets.ASC_NONMAS_PROFILE }} + ascMasProfile: ${{ secrets.ASC_EMBEDDED_PROFILE }} + ascEntitlementsMas: ${{ secrets.ASC_MAS_ENTITLEMENTS }} + ascEntitlementsMac: ${{ secrets.ASC_MAC_ENTITLEMENTS }} + ascInfoPlist: ${{ secrets.ASC_INFO_PLIST }} - name: Install dependencies and build run: | npm install npm run build --if-present - npm run build-desktop-darwin-nosign \ No newline at end of file + npm run build-desktop-darwin \ No newline at end of file From 83df75bbc2c3100313dac62c7192e2eedc070ffd Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Thu, 26 Sep 2019 09:47:51 -0400 Subject: [PATCH 11/14] Fix file name with mas.b64 --- .github/workflows/ci-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml index 40a8dd3..89a195c 100644 --- a/.github/workflows/ci-mac.yml +++ b/.github/workflows/ci-mac.yml @@ -26,7 +26,7 @@ jobs: echo "Installing certificates and profiles..." base64 --decode certs.b64 > Certificates.p12 - base64 --decode mas.64 > desktop/embedded.provisionprofile + base64 --decode mas.b64 > desktop/embedded.provisionprofile base64 --decode mac.b64 > desktop/nonmas.provisionprofile base64 --decode entmas.b64 > desktop/entitlements.mas.plist base64 --decode entmac.b64 > desktop/entitlements.mac.plist From 5f83b206ca84e61eeda8cf36e9410cac34c10174 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Thu, 26 Sep 2019 10:17:11 -0400 Subject: [PATCH 12/14] Switch back to nosign for now --- .github/workflows/ci-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml index 89a195c..b6a1846 100644 --- a/.github/workflows/ci-mac.yml +++ b/.github/workflows/ci-mac.yml @@ -46,4 +46,4 @@ jobs: run: | npm install npm run build --if-present - npm run build-desktop-darwin \ No newline at end of file + npm run build-desktop-darwin-nosign \ No newline at end of file From 8b5a055767846428c5bd9f7f22b5f57d45fb5dcf Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 2 Oct 2019 13:35:11 -0400 Subject: [PATCH 13/14] Change noosing to just not run notarization --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 72ea036..9385d73 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "build-desktop": "npm run build; npm run create-mac-icon; electron-builder -p 'never' -mwl deb AppImage snap", "build-desktop-win": "electron-builder -p 'never' -w", "build-desktop-darwin": "npm run create-mac-icon; electron-builder -p 'never' -m", - "build-desktop-darwin-nosign": "npm run create-mac-icon; electron-builder -p 'never' -m dmg -c.mac.identity=null -c.afterSign=\"desktop/donothing.js\"", + "build-desktop-darwin-nosign": "npm run create-mac-icon; electron-builder -p 'never' -m dmg -c.afterSign=\"desktop/donothing.js\"", "build-desktop-linux": "electron-builder -p 'never' -l deb AppImage snap", "build-desktop-linux-select": "electron-builder -p 'never' -l ", "test": "react-scripts test", From 5b45de21e6b9ec86d938ffaab1dd0538583e178b Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Wed, 2 Oct 2019 13:43:55 -0400 Subject: [PATCH 14/14] =?UTF-8?q?Perform=20'noosing'=20regression=20?= =?UTF-8?q?=F0=9F=A4=A6=E2=80=8D=E2=99=80=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9385d73..72ea036 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "build-desktop": "npm run build; npm run create-mac-icon; electron-builder -p 'never' -mwl deb AppImage snap", "build-desktop-win": "electron-builder -p 'never' -w", "build-desktop-darwin": "npm run create-mac-icon; electron-builder -p 'never' -m", - "build-desktop-darwin-nosign": "npm run create-mac-icon; electron-builder -p 'never' -m dmg -c.afterSign=\"desktop/donothing.js\"", + "build-desktop-darwin-nosign": "npm run create-mac-icon; electron-builder -p 'never' -m dmg -c.mac.identity=null -c.afterSign=\"desktop/donothing.js\"", "build-desktop-linux": "electron-builder -p 'never' -l deb AppImage snap", "build-desktop-linux-select": "electron-builder -p 'never' -l ", "test": "react-scripts test",