prepare for compile and release

Author: dragonwocky

.github/workflows/notion-repackaged.yml

@@ -1,12 +1,6 @@
 name: repackage-notion-app
 
 on:
-  push:
-    branches: [main]
-    paths:
-      - 'env.sh'
-      - '.github/workflows/notion-repackaged.yml'
-
   workflow_dispatch:
     inputs: {}
 
@@ -20,16 +14,16 @@ jobs:
     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
-
           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_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 }}
 
@@ -44,11 +38,12 @@ 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
     runs-on: ubuntu-latest
-    needs: [preload-variables, create-release]
+    needs: []
     steps:
       - uses: actions/checkout@v2
       - name: install build dependencies
@@ -74,10 +69,11 @@ jobs:
 
   build-app:
     name: build app
-    needs: [generate-sources, preload-variables, create-release]
+    needs: [create-release, generate-sources]
     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:
@@ -107,7 +103,7 @@ jobs:
           path: build/${{ matrix.edition }}-src.zip
       - name: unzip sources with 7z
         run: 7z x build/${{ matrix.edition }}-src.zip
-      - name: Install Linux build dependencies
+      - 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
@@ -124,7 +120,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NOTION_REPACKAGED_EDITION: ${{ matrix.edition }}
-        run: npx electron-builder --${{ matrix.target }} -c ../electron-builder.js
+        run: node_modules/.bin/electron-builder --${{ matrix.target }} -c ../electron-builder.js
 
   cleanup:
     name: cleanup artifacts
@@ -137,4 +133,4 @@ jobs:
     steps:
       - uses: geekyeggo/delete-artifact@v1
         with:
-          name: '${{ matrix.edition }}-sources'
+          name: ${{ matrix.edition }}-sources

.github/workflows/purge-artifacts.yml

@@ -127,18 +127,11 @@ if $enhance_build; then
     .name="notion-app-enhanced"' "${NOTION_ENHANCED_SRC_DIRNAME}/package.json")
   echo "${PATCHED_PACKAGE_JSON}" > "${NOTION_ENHANCED_SRC_DIRNAME}/package.json"
 
-  log "enhance" "downloading enhancer src..."
-
-  git clone "${NOTION_ENHANCER_REPO_URL}" "${NOTION_EMBEDDED_DIRNAME}"
-
-  pushd "${NOTION_EMBEDDED_DIRNAME}" > /dev/null
-  git reset "${NOTION_ENHANCER_COMMIT}" --hard
-  rm -rf .git
-
   log "enhance" "injecting enhancer loader..."
-  for patchable_file in $(find . -type d \( -path "./${NOTION_EMBEDDED_DIRNAME}" -o -path ./node_modules \) -prune -false -o -name '*.js'); do
+  pushd "${NOTION_ENHANCED_SRC_DIRNAME}" > /dev/null
+  for patchable_file in $(find . -name '*.js'); do
     patchable_file_dir=$(dirname $patchable_file)
-    rel_loader_path=$(realpath "${NOTION_EMBEDDED_DIRNAME}/pkg/loader.js" --relative-to "$patchable_file_dir") 
+    rel_loader_path="$(realpath "${NOTION_EMBEDDED_DIRNAME}" --relative-to "$patchable_file_dir")/pkg/loader.js"
     [ $patchable_file_dir = '.' ] && rel_loader_path="./"$rel_loader_path
     rel_loader_require="require('${rel_loader_path}')(__filename, exports);"
 
@@ -147,14 +140,22 @@ if $enhance_build; then
     echo "${rel_loader_require}" >> $patchable_file
   done
 
+  log "enhance" "downloading enhancer src..."
+
+  git clone "${NOTION_ENHANCER_REPO_URL}" "${NOTION_EMBEDDED_DIRNAME}"
+
+  pushd "${NOTION_EMBEDDED_DIRNAME}" > /dev/null
+  git reset "${NOTION_ENHANCER_COMMIT}" --hard
+  rm -rf .git
+
   # patch
 
   log "patch" "applying notion patches..."
   pushd "${NOTION_ENHANCED_SRC_DIRNAME}" > /dev/null
+  sed -i 's|process.platform === "win32"|process.platform !== "darwin"|g' main/main.js
   find "${WORKSPACE_DIR}/patches/notion" -type f -wholename "*.patch" -print0 | while IFS= read -r -d '' file; do
       patch -p0 --binary < "$file"
   done
-  sed -i 's|process.platform === "win32"|process.platform !== "darwin"|g' main/main.js
 
   log "patch" "applying enhancer patches..."
   pushd "${NOTION_EMBEDDED_DIRNAME}" > /dev/null
@@ -210,6 +211,6 @@ if $compile_vanilla || $compile_enhanced; then
 
   log "compile" "running electron-builder..."
   node_modules/.bin/electron-builder \
-    --config $WORKSPACE_DIR/electron-builder.js $@
+    -c $WORKSPACE_DIR/electron-builder.js
 fi
 

build.sh

@@ -10,10 +10,7 @@ const editionEnvVar = ensureEnvVar('NOTION_REPACKAGED_EDITION'),
   versionEnvVar = ensureEnvVar('NOTION_VERSION'),
   revisionEnvVar = ensureEnvVar('NOTION_REPACKAGED_REVISION');
 
-const versionFpmOptions = [
-  `--version=${versionEnvVar}`, 
-  `--iteration=${revisionEnvVar}`
-];
+const versionFpmOptions = [`--version=${versionEnvVar}`, `--iteration=${revisionEnvVar}`];
 
 module.exports = {
   asar: editionEnvVar === 'vanilla',
@@ -56,7 +53,7 @@ module.exports = {
     mimeTypes: ['x-scheme-handler/notion'],
     desktop: {
       StartupNotify: 'true',
-      StartupWMClass: editionEnvVar === 'vanilla' ? 'notion-app' : 'notion-app-enhanced'
+      StartupWMClass: editionEnvVar === 'vanilla' ? 'notion-app' : 'notion-app-enhanced',
     },
     target: ['AppImage', 'deb', 'rpm', 'pacman', 'zip'],
   },