fix script
This commit is contained in:
parent
cb044949d8
commit
6430cdf9e7
2 changed files with 18 additions and 14 deletions
|
|
@ -7,17 +7,17 @@ stages:
|
||||||
Build LibreWolf:
|
Build LibreWolf:
|
||||||
stage: Build
|
stage: Build
|
||||||
script:
|
script:
|
||||||
- cd browser
|
- cd browser/linux
|
||||||
- ./build.sh
|
- ./build.sh
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- "browser/build_output"
|
- "browser/linux/build_output"
|
||||||
|
|
||||||
Release to Gitlab:
|
Release to Gitlab:
|
||||||
stage: Release
|
stage: Release
|
||||||
image: python3
|
image: python3
|
||||||
script:
|
script:
|
||||||
- pip3 install gitlab-release
|
- pip3 install gitlab-release
|
||||||
- gitlab-release browser/build_output/*
|
- gitlab-release browser/linux/build_output/*
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
|
|
|
||||||
|
|
@ -4,16 +4,21 @@ printf "\n------------------------------------- SCRIPT SETUP -------------------
|
||||||
# Prevents build from breaking in CI/CD environments
|
# Prevents build from breaking in CI/CD environments
|
||||||
export SHELL=/bin/bash;
|
export SHELL=/bin/bash;
|
||||||
|
|
||||||
|
# Aborts the script upon any faliure
|
||||||
|
set -e;
|
||||||
|
|
||||||
# Sets up internal script variables
|
# Sets up internal script variables
|
||||||
printf "\nSetting up script variables\n";
|
printf "\nSetting up script variables\n";
|
||||||
SCRIPT_FOLDER=$(realpath $(dirname $0));
|
SCRIPT_FOLDER=$(realpath $(dirname $0));
|
||||||
REPOSITORY_FOLDER=$(realpath $SCRIPT_FOLDER/../);
|
REPOSITORY_FOLDER=$(realpath $SCRIPT_FOLDER/../../);
|
||||||
BRANDING_FOLDER=$SCRIPT_FOLDER/resources/source_files/browser/branding/librewolf;
|
SOURCE_FOLDER=$REPOSITORY_FOLDER/browser/common/source_files/
|
||||||
|
BRANDING_FOLDER=$SOURCE_FOLDER/browser/branding/librewolf;
|
||||||
ICON_FOLDER=$REPOSITORY_FOLDER/branding/icon/;
|
ICON_FOLDER=$REPOSITORY_FOLDER/branding/icon/;
|
||||||
PACKAGE_FILE="librewolf*.tar.bz2";
|
PACKAGE_FILE="librewolf*.tar.bz2";
|
||||||
APPIMAGE_RESOURCE_FOLDER=$SCRIPT_FOLDER/resources/appimage;
|
APPIMAGE_RESOURCE_FOLDER=$SCRIPT_FOLDER/resources/appimage;
|
||||||
printf "SCRIPT_FOLDER: $SCRIPT_FOLDER\n";
|
printf "SCRIPT_FOLDER: $SCRIPT_FOLDER\n";
|
||||||
printf "REPOSITORY_FOLDER: $REPOSITORY_FOLDER\n";
|
printf "REPOSITORY_FOLDER: $REPOSITORY_FOLDER\n";
|
||||||
|
printf "SOURCE_FOLDER: $SOURCE_FOLDER\n";
|
||||||
printf "BRANDING_FOLDER: $BRANDING_FOLDER\n";
|
printf "BRANDING_FOLDER: $BRANDING_FOLDER\n";
|
||||||
printf "ICON_FOLDER: $ICON_FOLDER\n";
|
printf "ICON_FOLDER: $ICON_FOLDER\n";
|
||||||
printf "PACKAGE_FILE: $PACKAGE_FILE\n";
|
printf "PACKAGE_FILE: $PACKAGE_FILE\n";
|
||||||
|
|
@ -22,11 +27,7 @@ printf "APPIMAGE_RESOURCE_FOLDER: $APPIMAGE_RESOURCE_FOLDER\n";
|
||||||
# Installs some needed dependencies
|
# Installs some needed dependencies
|
||||||
printf "\nInstalling script dependencies\n";
|
printf "\nInstalling script dependencies\n";
|
||||||
apt update;
|
apt update;
|
||||||
apt install sudo python python3 inkscape icnsutils wget fuse libfuse-dev kmod -y;
|
apt install sudo python python3 inkscape icnsutils wget -y;
|
||||||
|
|
||||||
# Loads the FUSE kernel module
|
|
||||||
sudo depmod;
|
|
||||||
sudo modprobe fuse;
|
|
||||||
|
|
||||||
printf "\n\n---------------------------------- ICON GENERATION ------------------------------------------\n";
|
printf "\n\n---------------------------------- ICON GENERATION ------------------------------------------\n";
|
||||||
|
|
||||||
|
|
@ -54,7 +55,7 @@ printf "\n\n-------------------------------------- PREBUILD --------------------
|
||||||
# Downloads and runs bootstrapper to install dependencies.
|
# Downloads and runs bootstrapper to install dependencies.
|
||||||
printf "\nRunning bootstrapper to install build dependencies\n";
|
printf "\nRunning bootstrapper to install build dependencies\n";
|
||||||
wget https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py;
|
wget https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py;
|
||||||
python ./bootstrap.py --application-choice=browser --no-interactive;
|
python ./bootstrap.py --application-choice=browser --no-interactive || true
|
||||||
|
|
||||||
# adds the new rust install to PATH
|
# adds the new rust install to PATH
|
||||||
printf "\nAdding new rust install to PATH\n";
|
printf "\nAdding new rust install to PATH\n";
|
||||||
|
|
@ -64,7 +65,7 @@ printf "\n\n--------------------------------------- BUILD ----------------------
|
||||||
|
|
||||||
# Creates and enters the folder where compiling will take place
|
# Creates and enters the folder where compiling will take place
|
||||||
printf "\nCreating compile folder\n";
|
printf "\nCreating compile folder\n";
|
||||||
mkdir compile_folder;
|
mkdir -p compile_folder;
|
||||||
cd compile_folder;
|
cd compile_folder;
|
||||||
|
|
||||||
# Clones the firefox source code for compiling
|
# Clones the firefox source code for compiling
|
||||||
|
|
@ -73,7 +74,10 @@ hg clone https://hg.mozilla.org/releases/mozilla-release;
|
||||||
|
|
||||||
# Copies our branding to the source code, changing it from firefox to librewolf
|
# Copies our branding to the source code, changing it from firefox to librewolf
|
||||||
printf "\nCopying branding to firefox source code\n";
|
printf "\nCopying branding to firefox source code\n";
|
||||||
cp -r $SCRIPT_FOLDER/resources/source_files/* mozilla-release;
|
cp -r $SOURCE_FOLDER/* ./mozilla-release;
|
||||||
|
|
||||||
|
# Adds fix to allow user preferences to be locked
|
||||||
|
sed -i '\|MOZ_ASSERT(!aIsLocked); // `locked` is disallowed in user pref files|d' ./mozilla-release/modules/libpref/Preferences.cpp;
|
||||||
|
|
||||||
cd mozilla-release;
|
cd mozilla-release;
|
||||||
|
|
||||||
|
|
@ -103,7 +107,7 @@ tar -xvf ./$PACKAGE_FILE;
|
||||||
|
|
||||||
# Adds the librefox config files to the packaged tarball
|
# Adds the librefox config files to the packaged tarball
|
||||||
printf "\nCopying librewolf settings to extracted binary tarball\n";
|
printf "\nCopying librewolf settings to extracted binary tarball\n";
|
||||||
cp -r $REPOSITORY_FOLDER/settings/* ./librewolf;
|
cp -r $REPOSITORY_FOLDER/settings ./librewolf/settings;
|
||||||
|
|
||||||
# Repacks the binary tarball
|
# Repacks the binary tarball
|
||||||
printf "\nRecompressing binary tarball\n";
|
printf "\nRecompressing binary tarball\n";
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue