librewolf-bot/windows
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

docker builds seem to work completely for the first time now

Browse source
This commit is contained in:
Bert van der Weerd 2021-10-06 15:43:21 +02:00
parent cf9d5ae61b
commit eca9b131f7
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
7 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docker/librewolf/Makefile
View file

@ -2,6 +2,7 @@
all : all :
cp ../version .
cp version debian10/version && cp version debian11/version && cp version fedora/version && cp version ubuntu20/version && cp version mint20/version && cp version arch && cp version macos && cp version windows && cp version portable-linux cp version debian10/version && cp version debian11/version && cp version fedora/version && cp version ubuntu20/version && cp version mint20/version && cp version arch && cp version macos && cp version windows && cp version portable-linux
make -C arch make -C arch

2
docker/librewolf/debian10/deb/Makefile
View file

@ -1,5 +1,5 @@
distro = debian10 distro = debian10
extractor = extract5 extractor = extract10
docker_stage = deb-$(distro) docker_stage = deb-$(distro)
version = `cat ../version` version = `cat ../version`

2
docker/librewolf/debian11/deb/Makefile
View file

@ -1,5 +1,5 @@
distro = debian11 distro = debian11
extractor = extract5 extractor = extract11
docker_stage = deb-$(distro) docker_stage = deb-$(distro)
version = `cat ../version` version = `cat ../version`

2
docker/librewolf/fedora/rpm/Dockerfile
View file

@ -6,7 +6,7 @@ run cp librewolf-$(cat /version).en-US.rpm.zip /artifacts
run sudo dnf -y install rpm-build run sudo dnf -y install rpm-build
workdir /root workdir /
copy build-rpm.sh . copy build-rpm.sh .
copy librewolf.spec . copy librewolf.spec .
run ./build-rpm.sh run ./build-rpm.sh

3
docker/librewolf/fedora/rpm/Makefile
View file

@ -30,8 +30,7 @@ artifacts/build_tag :
sudo docker cp $(extractor):/artifacts . sudo docker cp $(extractor):/artifacts .
sudo docker rm $(extractor) sudo docker rm $(extractor)
sudo mv -v artifacts/librewolf-$(version).en-US.rpm.zip artifacts/librewolf-$(version).en-US.$(distro).zip sudo mv -v artifacts/librewolf-$(version).en-US.rpm.zip artifacts/librewolf-$(version).en-US.$(distro).zip
sudo mv -v artifacts/librewolf-$(version)-1.x86_64.fc34.rpm artifacts/librewolf-$(version).en-US.$(distro).rpm
sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip
sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).rpm sudo chown user:user artifacts/librewolf-$(version)-1.fc34.x86_64.rpm
scp artifacts/*.rpm vps:pub/pub/librewolf scp artifacts/*.rpm vps:pub/pub/librewolf

45
docker/librewolf/fedora/rpm/build-rpm.sh
View file

@ -1,11 +1,28 @@
version=$(cat version) rm -rf /WORK
mkdir /WORK
cd /WORK
version=$(cat ../version)
echo '---'
echo "--- LibreWolf version file is: $version"
echo '---'
echo '--- Contents of /artifacts folder:'
ls -la /artifacts
echo '---'
echo '--- Contents of /WORK folder:'
ls -la /WORK
echo '---'
rm -rf rpmbuild rm -rf rpmbuild
mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
sed "s/__VERSION__/$version/g" < librewolf.spec > rpmbuild/SPECS/librewolf.spec sed "s/__VERSION__/$version/g" < /librewolf.spec > rpmbuild/SPECS/librewolf.spec
cp -v artifacts/librewolf-$version.en-US.fedora.zip rpmbuild/SOURCES/librewolf.zip cp -v /artifacts/librewolf-$version.en-US.rpm.zip rpmbuild/SOURCES/librewolf.zip
cd rpmbuild/SOURCES cd rpmbuild/SOURCES
unzip librewolf.zip unzip librewolf.zip
@ -20,19 +37,25 @@ cd librewolf-$version/usr/bin
ln -s ../share/librewolf/librewolf ln -s ../share/librewolf/librewolf
cd ../../.. cd ../../..
# Application icon
mkdir -p librewolf-$version/usr/share/applications
mkdir -p librewolf-$version/usr/share/icons
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/librewolf.png
sed "s/MYDIR/\/usr\/share\/librewolf/g" < librewolf-$version/usr/share/librewolf/start-librewolf.desktop.in > librewolf-$version/usr/share/applications/librewolf.desktop
tar cvfz lw.tar.gz librewolf-$version tar cvfz lw.tar.gz librewolf-$version
# todo perhaps: rm -rf librwolf-$version
cd librewolf-$version
find . > ../../../lw-dir.txt
cd ..
rm -rf lw
cd ../.. cd ../..
rm -rf ~/rpmbuild rm -rf $HOME/rpmbuild
cp -rv rpmbuild ~ cp -rv rpmbuild $HOME
# Build the package! # Build the package!
echo '---'
echo "[debug] Running rpmbuild.." echo "[debug] Running rpmbuild.."
echo '---'
rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec
cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm artifacts cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm /artifacts

2
docker/librewolf/fedora/rpm/librewolf.spec
View file

@ -64,3 +64,5 @@ cp -rv * "$RPM_BUILD_ROOT"
/usr/share/librewolf/start-librewolf /usr/share/librewolf/start-librewolf
/usr/share/librewolf/start-librewolf.desktop.in /usr/share/librewolf/start-librewolf.desktop.in
/usr/bin/librewolf /usr/bin/librewolf
/usr/share/applications/librewolf.desktop
/usr/share/icons/librewolf.png