From 8ae78802ad7ca914e59e1c9ea1bc8445cd5801f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Mart=C3=ADnez=20Rinc=C3=B3n?= <jaime@jamezrin.name>
Date: Sat, 25 Dec 2021 01:16:05 +0100
Subject: [PATCH] Revert "Try app release channels"

This reverts commit d2958a4ceac1c5607ec38f9b2c2ff23f3ef0867e.
---
 .github/workflows/notion-repackaged.yml | 14 ++++----------
 scripts/enhance-src.sh                  | 10 ++--------
 scripts/extract-src.sh                  |  6 +++---
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/notion-repackaged.yml b/.github/workflows/notion-repackaged.yml
index b5d1175..6c3ba94 100644
--- a/.github/workflows/notion-repackaged.yml
+++ b/.github/workflows/notion-repackaged.yml
@@ -29,7 +29,7 @@ jobs:
           echo "::set-output name=notion_download_hash::$NOTION_DOWNLOAD_HASH"
           echo "::set-output name=notion_enhancer_desktop_commit::$NOTION_ENHANCER_DESKTOP_COMMIT"
 
-          NOTION_REPACKAGED_VERSION_REV="${NOTION_VERSION}-{0}.${NOTION_REPACKAGED_REVISION}"
+          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 }}
@@ -42,17 +42,14 @@ jobs:
     name: Create release
     runs-on: ubuntu-latest
     needs: [preload-variables]
-    strategy:
-      matrix:
-        edition: [vanilla, enhanced]
     steps:
       - uses: actions/checkout@v2
       - uses: release-drafter/release-drafter@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          version: ${{ format(needs.preload-variables.outputs.notion_repackaged_version_rev, matrix.edition) }}
-          tag: v${{ format(needs.preload-variables.outputs.notion_repackaged_version_rev, matrix.edition) }}
+          version: ${{ needs.preload-variables.outputs.notion_repackaged_version_rev }}
+          tag: v${{ needs.preload-variables.outputs.notion_repackaged_version_rev }}
 
   make-vanilla-sources:
     name: Make vanilla sources
@@ -82,11 +79,8 @@ jobs:
 
   make-enhanced-sources:
     name: Make enhanced sources
-    runs-on: ubuntu-latest
     needs: [make-vanilla-sources, preload-variables]
-    env:
-      NOTION_VERSION: ${{ needs.preload-variables.outputs.notion_version }}
-      NOTION_REPACKAGED_REVISION: ${{ needs.preload-variables.outputs.notion_repackaged_revision }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Install icnsutils and moreutils
diff --git a/scripts/enhance-src.sh b/scripts/enhance-src.sh
index 44bb1c3..f8b16ad 100755
--- a/scripts/enhance-src.sh
+++ b/scripts/enhance-src.sh
@@ -5,7 +5,7 @@ source `dirname $0`/_utils.sh
 workdir ${WORKSPACE_BUILD_DIR}
 
 check-cmd jq git convert png2icns node sponge
-check-env NOTION_VERSION NOTION_REPACKAGED_REVISION NOTION_ENHANCER_DESKTOP_COMMIT
+check-env NOTION_ENHANCER_DESKTOP_COMMIT
 
 if [ -d "${NOTION_ENHANCED_SRC_NAME}" ]; then
   log "Removing already enhanced sources..."
@@ -23,13 +23,7 @@ pushd "${NOTION_ENHANCED_SRC_NAME}" > /dev/null
 
 log "Patching package.json for being enhanced..."
 
-NOTION_APP_PACKAGE_VERSION="${NOTION_VERSION}-enhanced.${NOTION_REPACKAGED_REVISION}"
-
-jq \
-  --arg version "${NOTION_APP_PACKAGE_VERSION}" \
-  '.name="notion-app-enhanced" |
-  .version=$version' \
-  package.json | sponge package.json
+jq '.name="notion-app-enhanced"' package.json | sponge package.json
 
 popd > /dev/null
 
diff --git a/scripts/extract-src.sh b/scripts/extract-src.sh
index fc4d3de..a83d932 100755
--- a/scripts/extract-src.sh
+++ b/scripts/extract-src.sh
@@ -36,6 +36,8 @@ log "Copying original app resources..."
 mkdir -p "${NOTION_VANILLA_SRC_NAME}"
 cp -r "${NOTION_EXTRACTED_APP_NAME}/resources/app/"* "${NOTION_VANILLA_SRC_NAME}"
 
+export NOTION_REPACKAGED_VERSION_REV="${NOTION_VERSION}-${NOTION_REPACKAGED_REVISION}"
+
 pushd "${NOTION_VANILLA_SRC_NAME}" > /dev/null
 
 log "Patching and cleaning source"
@@ -58,13 +60,11 @@ find . -type f -name "*.js.map" -exec rm {} +
 
 log "Adapting package.json including fixes..."
 
-NOTION_APP_PACKAGE_VERSION="${NOTION_VERSION}-vanilla.${NOTION_REPACKAGED_REVISION}"
-
 jq \
-  --arg version "${NOTION_APP_PACKAGE_VERSION}" \
   --arg homepage "${NOTION_REPACKAGED_HOMEPAGE}" \
   --arg repo "${NOTION_REPACKAGED_REPO}" \
   --arg author "${NOTION_REPACKAGED_AUTHOR}" \
+  --arg version "${NOTION_REPACKAGED_VERSION_REV}" \
   '.dependencies.cld="2.7.0" | 
   .name="notion-app" | 
   .homepage=$homepage |