1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-07 20:39:59 +02:00

Switch stable branch to release branch

This commit is contained in:
mr. M 2025-01-04 19:13:46 +01:00
parent bc6c6ce66d
commit d5573be1e9
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
37 changed files with 22 additions and 36 deletions

View file

@ -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]

View file

@ -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

View file

@ -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"

View file

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 219 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 6 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 105 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 104 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 699 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 824 B

After

Width:  |  Height:  |  Size: 824 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 957 B

After

Width:  |  Height:  |  Size: 957 B

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before After
Before After

View file

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

Before After
Before After

View file

@ -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
```

View file

@ -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",

10
pnpm-lock.yaml generated
View file

@ -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

View file

@ -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",