revert to jamezrin's separated build scripts

Author: dragonwocky

.github/workflows/notion-repackaged.yml

@@ -1,6 +1,12 @@
-name: repackage-notion-app
+name: Notion Repackaged Main
 
 on:
+  push:
+    branches: [main]
+    paths:
+      - 'notion-repackaged.sh'
+      - '.github/workflows/notion-repackaged.yml'
+
   workflow_dispatch:
     inputs: {}
 
@@ -9,26 +15,31 @@ env:
 
 jobs:
   preload-variables:
-    name: preload variables
+    name: Preload variables
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - id: preload-variables
-        name: load variables and set them as outputs
+        name: Load variables and set them as outputs
         run: |
-          source env.sh
+          source notion-repackaged.sh
+
           echo "::set-output name=notion_version::$NOTION_VERSION"
-          echo "::set-output name=notion_repackaged_edition::$NOTION_REPACKAGED_EDITION"
           echo "::set-output name=notion_repackaged_revision::$NOTION_REPACKAGED_REVISION"
+          echo "::set-output name=notion_download_hash::$NOTION_DOWNLOAD_HASH"
+          echo "::set-output name=notion_enhancer_commit::$NOTION_ENHANCER_COMMIT"
+
+          NOTION_REPACKAGED_VERSION_REV="${NOTION_VERSION}-${NOTION_REPACKAGED_REVISION}"
           echo "::set-output name=notion_repackaged_version_rev::$NOTION_REPACKAGED_VERSION_REV"
     outputs:
       notion_version: ${{ steps.preload-variables.outputs.notion_version }}
-      notion_repackaged_edition: ${{ steps.preload-variables.outputs.notion_repackaged_edition }}
       notion_repackaged_revision: ${{ steps.preload-variables.outputs.notion_repackaged_revision }}
       notion_repackaged_version_rev: ${{ steps.preload-variables.outputs.notion_repackaged_version_rev }}
+      notion_download_hash: ${{ steps.preload-variables.outputs.notion_download_hash }}
+      notion_enhancer_commit: ${{ steps.preload-variables.outputs.notion_enhancer_commit }}
 
   create-release:
-    name: create release
+    name: Create release
     runs-on: ubuntu-latest
     needs: [preload-variables]
     steps:
@@ -38,42 +49,66 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           version: ${{ needs.preload-variables.outputs.notion_repackaged_version_rev }}
-          tag: v${{ needs.preload-variables.outputs.notion_repackaged_version_rev }}
 
-  generate-sources:
-    name: extract and patch vanilla and enhanced sources
+  make-vanilla-sources:
+    name: Make vanilla sources
     runs-on: ubuntu-latest
-    needs: []
+    needs: [preload-variables]
+    env:
+      NOTION_VERSION: ${{ needs.preload-variables.outputs.notion_version }}
+      NOTION_REPACKAGED_REVISION: ${{ needs.preload-variables.outputs.notion_repackaged_revision }}
     steps:
       - uses: actions/checkout@v2
-      - name: install build dependencies
-        run: sudo apt install --no-install-recommends -y curl p7zip-full coreutils jq git imagemagick icnsutils
-      - name: run build script
-        run: ./build.sh --reset
-      - name: zip vanilla source dir with 7z
+      - name: Download official Windows build
+        env:
+          NOTION_DOWNLOAD_HASH: ${{ needs.preload-variables.outputs.notion_download_hash }}
+        run: scripts/download-exe.sh
+      - name: Extract sources from Windows Build
+        run: scripts/extract-src.sh
+      - name: Zip sources dir with 7z
         working-directory: build
         run: 7z a vanilla-src.zip vanilla-src
-      - name: save vanilla source as artifact
+      - name: Save vanilla sources as artifact
         uses: actions/upload-artifact@v2
         with:
           name: vanilla-sources
           path: build/vanilla-src.zip
-      - name: zip enhanced source dir with 7z
+
+  make-enhanced-sources:
+    name: Make enhanced sources
+    needs: [make-vanilla-sources, preload-variables]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Retrieve saved vanilla sources
+        uses: actions/download-artifact@v2
+        with:
+          name: vanilla-sources
+          path: build/vanilla-src.zip
+      - name: Unzip sources with 7z
+        working-directory: build
+        run: 7z x vanilla-src.zip
+      - name: Install icnsutils
+        run: sudo apt-get install -y icnsutils
+      - name: Enhance extracted sources
+        env:
+          NOTION_ENHANCER_COMMIT: ${{ needs.preload-variables.outputs.notion_enhancer_commit }}
+        run: scripts/enhance-src.sh
+      - name: Zip sources dir with 7z
         working-directory: build
         run: 7z a enhanced-src.zip enhanced-src
-      - name: save enhanced source as artifact
+      - name: Save enhanced sources as artifact
         uses: actions/upload-artifact@v2
         with:
           name: enhanced-sources
           path: build/enhanced-src.zip
 
   build-app:
-    name: build app
-    needs: [create-release, generate-sources]
+    name: Build app
+    needs: [make-vanilla-sources, make-enhanced-sources, preload-variables, create-release]
     runs-on: ${{ matrix.os }}
     env:
       NOTION_VERSION: ${{ needs.preload-variables.outputs.notion_version }}
-      NOTION_REPACKAGED_EDITION: ${{ needs.preload-variables.outputs.notion_repackaged_edition }}
       NOTION_REPACKAGED_REVISION: ${{ needs.preload-variables.outputs.notion_repackaged_revision }}
     strategy:
       matrix:
@@ -96,34 +131,34 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 14
-      - name: retrieve saved sources
+      - name: Retrieve saved sources
         uses: actions/download-artifact@v2
         with:
           name: ${{ matrix.edition }}-sources
-          path: build/${{ matrix.edition }}-src.zip
-      - name: unzip sources with 7z
-        run: 7z x build/${{ matrix.edition }}-src.zip
-      - name: install linux build dependencies
+          path: sources.zip
+      - name: Unzip sources with 7z
+        run: 7z x sources.zip
+      - name: Install Linux build dependencies
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get install --no-install-recommends -y libopenjp2-tools rpm libarchive-tools
-      - name: install dependencies
+      - name: Install dependencies
         working-directory: ${{ matrix.edition }}-src
         run: npm install
-      - name: run patch-package
+      - name: Run patch-package
         working-directory: ${{ matrix.edition }}-src
         run: npx patch-package
-      - name: install electron and electron-builder
+      - name: Install electron and electron-builder
         working-directory: ${{ matrix.edition }}-src
         run: npm install electron@11 electron-builder --save-dev
-      - name: run electron-builder
+      - name: Run electron-builder
         working-directory: ${{ matrix.edition }}-src
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NOTION_REPACKAGED_EDITION: ${{ matrix.edition }}
-        run: node_modules/.bin/electron-builder --${{ matrix.target }} -c ../electron-builder.js
+        run: npx electron-builder --${{ matrix.target }} -c ../electron-builder.js
 
   cleanup:
-    name: cleanup artifacts
+    name: Cleanup artifacts
     if: always()
     needs: [build-app]
     strategy:
@@ -133,4 +168,4 @@ jobs:
     steps:
       - uses: geekyeggo/delete-artifact@v1
         with:
-          name: ${{ matrix.edition }}-sources
+          name: '${{ matrix.edition }}-sources'