diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4de8b77f..37a257f7 100644 --- a/.github/workflows/build.yml +++ b/.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] diff --git a/AppDir/zen.desktop b/AppDir/zen.desktop index a533fbbd..e9279001 100644 --- a/AppDir/zen.desktop +++ b/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 diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1 index cba28ca4..89e7b651 100644 --- a/build/winsign/sign.ps1 +++ b/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" diff --git a/configs/branding/stable/MacOSInstaller.svg b/configs/branding/release/MacOSInstaller.svg similarity index 100% rename from configs/branding/stable/MacOSInstaller.svg rename to configs/branding/release/MacOSInstaller.svg diff --git a/configs/branding/stable/PrivateBrowsing_150.png b/configs/branding/release/PrivateBrowsing_150.png similarity index 100% rename from configs/branding/stable/PrivateBrowsing_150.png rename to configs/branding/release/PrivateBrowsing_150.png diff --git a/configs/branding/stable/PrivateBrowsing_70.png b/configs/branding/release/PrivateBrowsing_70.png similarity index 100% rename from configs/branding/stable/PrivateBrowsing_70.png rename to configs/branding/release/PrivateBrowsing_70.png diff --git a/configs/branding/stable/VisualElements_150.png b/configs/branding/release/VisualElements_150.png similarity index 100% rename from configs/branding/stable/VisualElements_150.png rename to configs/branding/release/VisualElements_150.png diff --git a/configs/branding/stable/VisualElements_70.png b/configs/branding/release/VisualElements_70.png similarity index 100% rename from configs/branding/stable/VisualElements_70.png rename to configs/branding/release/VisualElements_70.png diff --git a/configs/branding/stable/content/about-logo-private.png b/configs/branding/release/content/about-logo-private.png similarity index 100% rename from configs/branding/stable/content/about-logo-private.png rename to configs/branding/release/content/about-logo-private.png diff --git a/configs/branding/stable/content/about-logo-private.svg b/configs/branding/release/content/about-logo-private.svg similarity index 100% rename from configs/branding/stable/content/about-logo-private.svg rename to configs/branding/release/content/about-logo-private.svg diff --git a/configs/branding/stable/content/about-logo-private@2x.png b/configs/branding/release/content/about-logo-private@2x.png similarity index 100% rename from configs/branding/stable/content/about-logo-private@2x.png rename to configs/branding/release/content/about-logo-private@2x.png diff --git a/configs/branding/stable/content/about-logo.png b/configs/branding/release/content/about-logo.png similarity index 100% rename from configs/branding/stable/content/about-logo.png rename to configs/branding/release/content/about-logo.png diff --git a/configs/branding/stable/content/about-logo.svg b/configs/branding/release/content/about-logo.svg similarity index 100% rename from configs/branding/stable/content/about-logo.svg rename to configs/branding/release/content/about-logo.svg diff --git a/configs/branding/stable/content/about-logo@2x.png b/configs/branding/release/content/about-logo@2x.png similarity index 100% rename from configs/branding/stable/content/about-logo@2x.png rename to configs/branding/release/content/about-logo@2x.png diff --git a/configs/branding/stable/content/about-wordmark.svg b/configs/branding/release/content/about-wordmark.svg similarity index 100% rename from configs/branding/stable/content/about-wordmark.svg rename to configs/branding/release/content/about-wordmark.svg diff --git a/configs/branding/stable/content/firefox-wordmark.svg b/configs/branding/release/content/firefox-wordmark.svg similarity index 100% rename from configs/branding/stable/content/firefox-wordmark.svg rename to configs/branding/release/content/firefox-wordmark.svg diff --git a/configs/branding/stable/document.ico b/configs/branding/release/document.ico similarity index 100% rename from configs/branding/stable/document.ico rename to configs/branding/release/document.ico diff --git a/configs/branding/stable/document_pdf.ico b/configs/branding/release/document_pdf.ico similarity index 100% rename from configs/branding/stable/document_pdf.ico rename to configs/branding/release/document_pdf.ico diff --git a/configs/branding/stable/firefox.ico b/configs/branding/release/firefox.ico similarity index 100% rename from configs/branding/stable/firefox.ico rename to configs/branding/release/firefox.ico diff --git a/configs/branding/stable/firefox64.ico b/configs/branding/release/firefox64.ico similarity index 100% rename from configs/branding/stable/firefox64.ico rename to configs/branding/release/firefox64.ico diff --git a/configs/branding/stable/logo-mac.png b/configs/branding/release/logo-mac.png similarity index 100% rename from configs/branding/stable/logo-mac.png rename to configs/branding/release/logo-mac.png diff --git a/configs/branding/stable/logo.png b/configs/branding/release/logo.png similarity index 100% rename from configs/branding/stable/logo.png rename to configs/branding/release/logo.png diff --git a/configs/branding/stable/logo1024.png b/configs/branding/release/logo1024.png similarity index 100% rename from configs/branding/stable/logo1024.png rename to configs/branding/release/logo1024.png diff --git a/configs/branding/stable/logo128.png b/configs/branding/release/logo128.png similarity index 100% rename from configs/branding/stable/logo128.png rename to configs/branding/release/logo128.png diff --git a/configs/branding/stable/logo16.png b/configs/branding/release/logo16.png similarity index 100% rename from configs/branding/stable/logo16.png rename to configs/branding/release/logo16.png diff --git a/configs/branding/stable/logo22.png b/configs/branding/release/logo22.png similarity index 100% rename from configs/branding/stable/logo22.png rename to configs/branding/release/logo22.png diff --git a/configs/branding/stable/logo24.png b/configs/branding/release/logo24.png similarity index 100% rename from configs/branding/stable/logo24.png rename to configs/branding/release/logo24.png diff --git a/configs/branding/stable/logo256.png b/configs/branding/release/logo256.png similarity index 100% rename from configs/branding/stable/logo256.png rename to configs/branding/release/logo256.png diff --git a/configs/branding/stable/logo32.png b/configs/branding/release/logo32.png similarity index 100% rename from configs/branding/stable/logo32.png rename to configs/branding/release/logo32.png diff --git a/configs/branding/stable/logo48.png b/configs/branding/release/logo48.png similarity index 100% rename from configs/branding/stable/logo48.png rename to configs/branding/release/logo48.png diff --git a/configs/branding/stable/logo512.png b/configs/branding/release/logo512.png similarity index 100% rename from configs/branding/stable/logo512.png rename to configs/branding/release/logo512.png diff --git a/configs/branding/stable/logo64.png b/configs/branding/release/logo64.png similarity index 100% rename from configs/branding/stable/logo64.png rename to configs/branding/release/logo64.png diff --git a/configs/branding/stable/pbmode.ico b/configs/branding/release/pbmode.ico similarity index 100% rename from configs/branding/stable/pbmode.ico rename to configs/branding/release/pbmode.ico diff --git a/docs/contribute.md b/docs/contribute.md index b97056d4..c14c4c11 100644 --- a/docs/contribute.md +++ b/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 -``` diff --git a/package.json b/package.json index c136ebc8..bd6aeea6 100644 --- a/package.json +++ b/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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 099cd2c5..0ee98a35 100644 --- a/pnpm-lock.yaml +++ b/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 diff --git a/surfer.json b/surfer.json index 88b2f31d..2b08484f 100644 --- a/surfer.json +++ b/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",