Switch stable branch to release branch

.github/workflows/build.yml

@@ -16,10 +16,10 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'stable'
+        default: 'release'
         type: 'choice'
         options:
-          - 'stable'
+          - 'release'
           - 'twilight'
   workflow_call:
     inputs:
@@ -36,7 +36,7 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'stable'
+        default: 'release'
         type: 'string'
 
 jobs:
@@ -122,7 +122,7 @@ jobs:
           npm i -g @zen-browser/surfer
 
       - name: Bump version
-        if: ${{ inputs.update_version && inputs.update_branch == 'stable' }}
+        if: ${{ inputs.update_version && inputs.update_branch == 'release' }}
         run: |
           pnpm surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
 
@@ -385,7 +385,7 @@ jobs:
 
           if [ "${{ inputs.update_branch }}" = "twilight" ]; then
             sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop
-            sed -i -e 's/StartupWMClass=zen-stable/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
+            sed -i -e 's/StartupWMClass=zen-release/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
           fi
 
           APPDIR=AppDir
@@ -425,7 +425,7 @@ jobs:
     needs: [build-data, linux, windows-step-3, check-release, mac, appimage, source, lint]
     runs-on: ubuntu-latest
     environment:
-      name: ${{ inputs.update_branch == 'stable' && 'Deploy-Release' || 'Deploy-Twilight' }}
+      name: ${{ inputs.update_branch == 'release' && 'Deploy-Release' || 'Deploy-Twilight' }}
 
     steps:
       - name: Checkout repository
@@ -464,7 +464,7 @@ jobs:
           cp -a ../linux_update_manifest_x86_64/.  updates/
           cp -a ../linux_update_manifest_aarch64/.  updates/
 
-          if [[ $RELEASE_BRANCH == 'stable' ]]; then
+          if [[ $RELEASE_BRANCH == 'release' ]]; then
             cp -a ../.github/workflows/object/windows-x64-signed-x86_64/update_manifest/.  updates/
             cp -a ../.github/workflows/object/windows-x64-signed-arm64/update_manifest/.  updates/
           else
@@ -518,12 +518,12 @@ jobs:
 
       - name: Release
         uses: marvinpinto/action-automatic-releases@master
-        if: ${{ inputs.update_branch == 'stable' }}
+        if: ${{ inputs.update_branch == 'release' }}
         with:
           repo_token: '${{ secrets.DEPLOY_KEY }}'
           automatic_release_tag: ${{ needs.build-data.outputs.version }}
           prerelease: false
-          title: 'Stable build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          title: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
             zen.source.tar.gz
             zen.linux-x86_64.tar.bz2
@@ -546,7 +546,7 @@ jobs:
             zen.macos-aarch64.dmg
 
   prepare-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'stable' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all
     name: Prepare Flatpak
     needs: [release, linux, build-data]
@@ -605,7 +605,7 @@ jobs:
         run: sleep 120
 
   release-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'stable' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all
     name: Release Flatpak
     needs: [prepare-flatpak, build-data]

AppDir/zen.desktop

@@ -5,7 +5,7 @@ Exec=zen %u
 Icon=zen
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
-StartupWMClass=zen-stable
+StartupWMClass=zen-release
 Categories=Network;WebBrowser;
 StartupNotify=true
 Terminal=false

build/winsign/sign.ps1

@@ -29,7 +29,7 @@ echo "Downloaded x86_64 artifacts"
 
 mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
 
-pnpm surfer ci --brand stable
+pnpm surfer ci --brand release
 
 function SignAndPackage($name) {
     echo "Executing on $name"

docs/contribute.md

@@ -20,17 +20,3 @@ The `stable` branch may have hotfixes directly from the `stable` branch, and the
 # Code Of Conduct
 
 Please read our [Code of Conduct](../CODE_OF_CONDUCT.md) before contributing.
-
-# Releasing/Merging branches
-
-To merge zen twilight branch from the central branch, you can use the following command:
-
-```bash
-sh ./scripts/merge-to-branch.sh twilight
-```
-
-To merge zen stable branch from the twilight branch, you can use the following command:
-
-```bash
-sh ./scripts/merge-to-branch.sh stable
-```

package.json

@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.8.5"
+    "@zen-browser/surfer": "^1.8.6"
   },
   "devDependencies": {
     "husky": "^9.1.7",

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.8.5
-        version: 1.8.5(glob@7.2.3)
+        specifier: ^1.8.6
+        version: 1.8.6(glob@7.2.3)
     devDependencies:
       husky:
         specifier: ^9.1.7
@@ -122,8 +122,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.8.5':
-    resolution: {integrity: sha512-cOkQAoPo+EiTvOBFFcg0Gof52I7XkSEt4OfZZlX4mefk/55fS1Ac8hRyWmlsMsNKO+IBB6cE2VAudXycXIIDsQ==}
+  '@zen-browser/surfer@1.8.6':
+    resolution: {integrity: sha512-S/zGDRlMROdUqy6i6ZzhB8llMFi08XBJ2ypSQjwDKfiCtCB3oUGMPx7ahzI79cY0mvuTLpr5/NERKlR7Wq9nkA==}
     hasBin: true
 
   ansi-escapes@7.0.0:
@@ -1036,7 +1036,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.8.5(glob@7.2.3)':
+  '@zen-browser/surfer@1.8.6(glob@7.2.3)':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

surfer.json

@@ -13,10 +13,10 @@
   },
   "addons": {},
   "brands": {
-    "stable": {
+    "release": {
       "backgroundColor": "#282A33",
       "brandShorterName": "Zen",
-      "brandShortName": "Zen Browser",
+      "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
         "displayVersion": "1.6b",
@@ -36,7 +36,7 @@
     "twilight": {
       "backgroundColor": "#282A33",
       "brandShorterName": "Zen",
-      "brandShortName": "Zen Twilight",
+      "brandShortName": "Zen",
       "brandFullName": "Zen Twilight",
       "release": {
         "displayVersion": "1.6t",