ZenBrowserMirrors/zen-desktop
1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-07 21:49:58 +02:00
Code Releases Wiki Activity

Refactor build process to use a new directory structure and remove deprecated files

Browse source
This commit is contained in:
mr. M 2025-03-29 15:42:33 +01:00
parent 6f5671e41f
commit c60c9fbd30
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
8 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
.github/workflows/build.yml vendored
View file

@ -385,23 +385,23 @@ jobs:
set -eux set -eux
export ARCH=${{ matrix.arch }} export ARCH=${{ matrix.arch }}
UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-$ARCH.AppImage.zsync" UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-$ARCH.AppImage.zsync"
rm AppDir/.DirIcon || true rm build/AppDir/.DirIcon || true
cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/usr/share/icons/hicolor/128x128/apps/zen.png cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/zen.png && ln -s zen.png AppDir/.DirIcon cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/zen.png && ln -s zen.png build/AppDir/.DirIcon
if [ "${{ inputs.update_branch }}" = "twilight" ]; then if [ "${{ inputs.update_branch }}" = "twilight" ]; then
sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' build/AppDir/zen.desktop
sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' AppDir/zen.desktop sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' build/AppDir/zen.desktop
fi fi
APPDIR=AppDir APPDIR=build/AppDir
tar -xvf *.tar.* && rm -rf *.tar.* tar -xvf *.tar.* && rm -rf *.tar.*
mv zen/* $APPDIR/ mv zen/* $APPDIR/
wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
wget "https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-squashfs-lite-$ARCH" wget "https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-squashfs-lite-$ARCH"
chmod +x *.AppImage chmod +x *.AppImage
chmod +x ./uruntime-appimage-squashfs-lite-"$ARCH" chmod +x ./uruntime-appimage-squashfs-lite-"$ARCH"
chmod +x ./AppDir/AppRun chmod +x ./build/AppDir/AppRun
# keep the uruntime mountpoint (massively speeds up launch time) # keep the uruntime mountpoint (massively speeds up launch time)
sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=0|' ./uruntime-appimage-squashfs-lite-"$ARCH" sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=0|' ./uruntime-appimage-squashfs-lite-"$ARCH"
@ -628,7 +628,7 @@ jobs:
pwd pwd
ls . ls .
ls .. ls ..
mv releases.xml ./flatpak/app.zen_browser.zen.metainfo.xml mv releases.xml ./build/flatpak/app.zen_browser.zen.metainfo.xml
# output the version to the file # output the version to the file
echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version

0
AppDir/AppRun → build/AppDir/AppRun
View file

0
AppDir/distribution/policies.json → build/AppDir/distribution/policies.json
View file

0
AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep → build/AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep
View file

0
AppDir/zen.desktop → build/AppDir/zen.desktop
View file

0
firefox-cache/l10n-last-commit-hash → build/firefox-cache/l10n-last-commit-hash
View file

0
flatpak/app.zen_browser.zen.yml.template → build/flatpak/app.zen_browser.zen.yml.template
View file

8
scripts/update_ff.py
View file

@ -62,13 +62,13 @@ def update_l10n_last_commit_hash():
try: try:
os.system(f"git clone {L10N_REPO} l10n-temp --depth 1") os.system(f"git clone {L10N_REPO} l10n-temp --depth 1")
if not os.path.exists("firefox-cache"): if not os.path.exists("firefox-cache"):
os.mkdir("firefox-cache") os.mkdir("build/firefox-cache")
os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash") os.system("cat l10n-temp/.git/refs/heads/main > build/firefox-cache/l10n-last-commit-hash")
# Remove new line character # Remove new line character
data = "" data = ""
with open("firefox-cache/l10n-last-commit-hash", "r") as f: with open("build/firefox-cache/l10n-last-commit-hash", "r") as f:
data = f.read() data = f.read()
with open("firefox-cache/l10n-last-commit-hash", "w") as f: with open("build/firefox-cache/l10n-last-commit-hash", "w") as f:
f.write(data.strip()) f.write(data.strip())
except KeyboardInterrupt: except KeyboardInterrupt:
print("Exiting...") print("Exiting...")