diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4431ad874..d10db4d8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ on:
type: 'choice'
options:
- 'alpha'
- - 'twilight' # updated each day basically
+ - 'twilight'
jobs:
build-data:
@@ -59,12 +59,12 @@ jobs:
npm i -g @zen-browser/surfer
- name: Bump version
- if: ${{ github.event.inputs.update_version == 'true' }}
+ if: ${{ github.event.inputs.update_version == 'true' && github.event.inputs.update_branch == 'alpha' }}
run: |
pnpm surfer ci --brand ${{ github.event.inputs.update_branch }} --bump prerelease
- name: Bump version without new version
- if: ${{ github.event.inputs.update_version == 'false' }}
+ if: ${{ github.event.inputs.update_version == 'false' || github.event.inputs.update_branch == 'twilight' }}
run: |
pnpm surfer ci --brand ${{ github.event.inputs.update_branch }}
@@ -356,8 +356,13 @@ jobs:
cp -a ../linux_update_manifest_generic/. updates/
cp -a ../linux_update_manifest_specific/. updates/
- cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/
- cp -a ../.github/workflows/object/windows-x64-signed-specific/update_manifest/. updates/
+ if [[ $RELEASE_BRANCH == 'alpha' ]]; then
+ cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/
+ cp -a ../.github/workflows/object/windows-x64-signed-specific/update_manifest/. updates/
+ else
+ cp -a ../windows_update_manifest_generic/. updates/
+ cp -a ../windows_update_manifest_specific/. updates/
+ fi
cp -a ../macos_update_manifest_aarch64/. updates/
cp -a ../macos_update_manifest_x64/. updates/
@@ -369,6 +374,45 @@ jobs:
commit_user_email: zen-browser-bot@users.noreply.github.com
repository: ./updates-server
+ # If we are on twilight, we want to just update the twilight tag's release
+ - name: Update twilight tag
+ if: ${{ github.event.inputs.update_branch == 'twilight' }}
+ uses: softprops/action-gh-release@v2
+ with:
+ files: |
+ zen.source.tar.gz
+ zen.linux-generic.tar.bz2
+ zen.linux-specific.tar.bz2
+ zen-generic.AppImage
+ zen-generic.AppImage.zsync
+ zen-specific.AppImage
+ zen-specific.AppImage.zsync
+ zen.win-generic.zip
+ zen.win-specific.zip
+ linux.mar
+ linux-generic.mar
+ windows-generic.mar
+ windows.mar
+ macos-x64.mar
+ macos-aarch64.mar
+ zen.installer.exe
+ zen.installer-generic.exe
+ zen.macos-x64.dmg
+ zen.macos-aarch64.dmg
+ tag_name: "twilight"
+ name: "Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})"
+ body: |
+ # Zen Twilight Build
+
+ This is the latest build from the twilight branch. It is updated more recently than the alpha branch.
+
+ * This build is not recommended for daily use, it may contain bugs, issues, and other problems.
+ draft: false
+ prerelease: true
+ token: ${{ github.token }}
+ env:
+ GITHUB_REPOSITORY: ${{ github.repository }}
+
- name: release-github
uses: 'marvinpinto/action-automatic-releases@latest'
if: ${{ github.event.inputs.update_branch == 'alpha' }}
diff --git a/configs/branding/twilight/MacOSInstaller.svg b/configs/branding/twilight/MacOSInstaller.svg
new file mode 100644
index 000000000..e89dc13f0
--- /dev/null
+++ b/configs/branding/twilight/MacOSInstaller.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/configs/branding/twilight/PrivateBrowsing_150.png b/configs/branding/twilight/PrivateBrowsing_150.png
new file mode 100644
index 000000000..747428bed
Binary files /dev/null and b/configs/branding/twilight/PrivateBrowsing_150.png differ
diff --git a/configs/branding/twilight/PrivateBrowsing_70.png b/configs/branding/twilight/PrivateBrowsing_70.png
new file mode 100644
index 000000000..3ee63fbba
Binary files /dev/null and b/configs/branding/twilight/PrivateBrowsing_70.png differ
diff --git a/configs/branding/twilight/VisualElements_150.png b/configs/branding/twilight/VisualElements_150.png
new file mode 100644
index 000000000..aecffa029
Binary files /dev/null and b/configs/branding/twilight/VisualElements_150.png differ
diff --git a/configs/branding/twilight/VisualElements_70.png b/configs/branding/twilight/VisualElements_70.png
new file mode 100644
index 000000000..fb7c6e693
Binary files /dev/null and b/configs/branding/twilight/VisualElements_70.png differ
diff --git a/configs/branding/twilight/content/about-logo-private.png b/configs/branding/twilight/content/about-logo-private.png
new file mode 100644
index 000000000..39eec8c20
Binary files /dev/null and b/configs/branding/twilight/content/about-logo-private.png differ
diff --git a/configs/branding/twilight/content/about-logo-private.svg b/configs/branding/twilight/content/about-logo-private.svg
new file mode 100644
index 000000000..92c394e5d
--- /dev/null
+++ b/configs/branding/twilight/content/about-logo-private.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/configs/branding/twilight/content/about-logo-private@2x.png b/configs/branding/twilight/content/about-logo-private@2x.png
new file mode 100644
index 000000000..1c8bd0db6
Binary files /dev/null and b/configs/branding/twilight/content/about-logo-private@2x.png differ
diff --git a/configs/branding/twilight/content/about-logo.png b/configs/branding/twilight/content/about-logo.png
new file mode 100644
index 000000000..d29aba262
Binary files /dev/null and b/configs/branding/twilight/content/about-logo.png differ
diff --git a/configs/branding/twilight/content/about-logo.svg b/configs/branding/twilight/content/about-logo.svg
new file mode 100644
index 000000000..fe4e7cd4b
--- /dev/null
+++ b/configs/branding/twilight/content/about-logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/configs/branding/twilight/content/about-logo@2x.png b/configs/branding/twilight/content/about-logo@2x.png
new file mode 100644
index 000000000..af1b6ca16
Binary files /dev/null and b/configs/branding/twilight/content/about-logo@2x.png differ
diff --git a/configs/branding/twilight/content/about-wordmark.svg b/configs/branding/twilight/content/about-wordmark.svg
new file mode 100644
index 000000000..e7cc9e4d6
--- /dev/null
+++ b/configs/branding/twilight/content/about-wordmark.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/configs/branding/twilight/content/firefox-wordmark.svg b/configs/branding/twilight/content/firefox-wordmark.svg
new file mode 100644
index 000000000..44f967dfa
--- /dev/null
+++ b/configs/branding/twilight/content/firefox-wordmark.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/configs/branding/twilight/document.ico b/configs/branding/twilight/document.ico
new file mode 100644
index 000000000..c759eaea9
Binary files /dev/null and b/configs/branding/twilight/document.ico differ
diff --git a/configs/branding/twilight/document_pdf.ico b/configs/branding/twilight/document_pdf.ico
new file mode 100644
index 000000000..411a919b9
Binary files /dev/null and b/configs/branding/twilight/document_pdf.ico differ
diff --git a/configs/branding/twilight/firefox.ico b/configs/branding/twilight/firefox.ico
new file mode 100644
index 000000000..a8c3eb9db
Binary files /dev/null and b/configs/branding/twilight/firefox.ico differ
diff --git a/configs/branding/twilight/firefox64.ico b/configs/branding/twilight/firefox64.ico
new file mode 100644
index 000000000..80f0d3580
Binary files /dev/null and b/configs/branding/twilight/firefox64.ico differ
diff --git a/configs/branding/twilight/logo-mac.png b/configs/branding/twilight/logo-mac.png
new file mode 100644
index 000000000..f7c70f931
Binary files /dev/null and b/configs/branding/twilight/logo-mac.png differ
diff --git a/configs/branding/twilight/logo.png b/configs/branding/twilight/logo.png
new file mode 100644
index 000000000..c9be6e756
Binary files /dev/null and b/configs/branding/twilight/logo.png differ
diff --git a/configs/branding/twilight/logo128.png b/configs/branding/twilight/logo128.png
new file mode 100644
index 000000000..039c9c776
Binary files /dev/null and b/configs/branding/twilight/logo128.png differ
diff --git a/configs/branding/twilight/logo16.png b/configs/branding/twilight/logo16.png
new file mode 100644
index 000000000..8548efa76
Binary files /dev/null and b/configs/branding/twilight/logo16.png differ
diff --git a/configs/branding/twilight/logo22.png b/configs/branding/twilight/logo22.png
new file mode 100644
index 000000000..57d4ac579
Binary files /dev/null and b/configs/branding/twilight/logo22.png differ
diff --git a/configs/branding/twilight/logo24.png b/configs/branding/twilight/logo24.png
new file mode 100644
index 000000000..1c26ecfce
Binary files /dev/null and b/configs/branding/twilight/logo24.png differ
diff --git a/configs/branding/twilight/logo256.png b/configs/branding/twilight/logo256.png
new file mode 100644
index 000000000..984481115
Binary files /dev/null and b/configs/branding/twilight/logo256.png differ
diff --git a/configs/branding/twilight/logo32.png b/configs/branding/twilight/logo32.png
new file mode 100644
index 000000000..99ae4a459
Binary files /dev/null and b/configs/branding/twilight/logo32.png differ
diff --git a/configs/branding/twilight/logo48.png b/configs/branding/twilight/logo48.png
new file mode 100644
index 000000000..41e16f2f3
Binary files /dev/null and b/configs/branding/twilight/logo48.png differ
diff --git a/configs/branding/twilight/logo512.png b/configs/branding/twilight/logo512.png
new file mode 100644
index 000000000..794e894d9
Binary files /dev/null and b/configs/branding/twilight/logo512.png differ
diff --git a/configs/branding/twilight/logo64.png b/configs/branding/twilight/logo64.png
new file mode 100644
index 000000000..2a86a4808
Binary files /dev/null and b/configs/branding/twilight/logo64.png differ
diff --git a/configs/branding/twilight/pbmode.ico b/configs/branding/twilight/pbmode.ico
new file mode 100644
index 000000000..73389e155
Binary files /dev/null and b/configs/branding/twilight/pbmode.ico differ
diff --git a/package.json b/package.json
index 77e5bdb4c..616a04a19 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
},
"homepage": "https://github.com/zen-browser/core#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.4.21"
+ "@zen-browser/surfer": "^1.4.23"
},
"devDependencies": {
"husky": "^9.1.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dca94456..2799efe18 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
.:
dependencies:
'@zen-browser/surfer':
- specifier: ^1.4.21
- version: 1.4.21
+ specifier: ^1.4.23
+ version: 1.4.23
devDependencies:
husky:
specifier: ^9.1.5
@@ -119,8 +119,8 @@ packages:
'@types/node@17.0.45':
resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
- '@zen-browser/surfer@1.4.21':
- resolution: {integrity: sha512-v05Mq6kjISGwWD7d6Bwl0zuH3JKu+xV5x/iJmMjgW3kReYwlKjexqkxQquKpn8bhwAbOBS/CtYBlRKi17Pqxpg==}
+ '@zen-browser/surfer@1.4.23':
+ resolution: {integrity: sha512-7j28RooH/dRkXGCeN0AEOWylTudj02TL90LqNpqR6Y+KJa85HQKKTx1yfD0y6Y4aBgALEyZS4Xxs9aOqUxQEjg==}
hasBin: true
ansi-escapes@7.0.0:
@@ -1003,7 +1003,7 @@ snapshots:
'@types/node@17.0.45': {}
- '@zen-browser/surfer@1.4.21':
+ '@zen-browser/surfer@1.4.23':
dependencies:
'@resvg/resvg-js': 1.4.0
async-icns: 1.0.2