tested mint20 and ubuntu20
This commit is contained in:
parent
2626643205
commit
9e67085d66
24 changed files with 41 additions and 40 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -16,5 +16,5 @@ build_tag
|
||||||
/docker/librewolf/debian10/deb/artifacts
|
/docker/librewolf/debian10/deb/artifacts
|
||||||
/docker/librewolf/debian11/deb/artifacts
|
/docker/librewolf/debian11/deb/artifacts
|
||||||
/docker/librewolf/fedora/rpm/artifacts
|
/docker/librewolf/fedora/rpm/artifacts
|
||||||
/docker/librewolf/mint/deb/artifacts
|
/docker/librewolf/mint20/deb/artifacts
|
||||||
/docker/librewolf/ubuntu/deb/artifacts
|
/docker/librewolf/ubuntu20/deb/artifacts
|
||||||
|
|
|
||||||
|
|
@ -42,10 +42,10 @@ fedora :
|
||||||
make -C buildenv/fedora
|
make -C buildenv/fedora
|
||||||
cp version librewolf/fedora
|
cp version librewolf/fedora
|
||||||
make -C librewolf/fedora
|
make -C librewolf/fedora
|
||||||
mint :
|
mint20 :
|
||||||
make -C buildenv/mint
|
make -C buildenv/mint20
|
||||||
cp version librewolf/mint
|
cp version librewolf/mint20
|
||||||
make -C librewolf/mint
|
make -C librewolf/mint20
|
||||||
ubuntu :
|
ubuntu :
|
||||||
make -C buildenv/ubuntu
|
make -C buildenv/ubuntu
|
||||||
cp version librewolf/ubuntu
|
cp version librewolf/ubuntu
|
||||||
|
|
@ -61,7 +61,7 @@ low_disk :
|
||||||
make prune
|
make prune
|
||||||
make fedora
|
make fedora
|
||||||
make prune
|
make prune
|
||||||
make mint
|
make mint20
|
||||||
make prunt
|
make prunt
|
||||||
make ubuntu
|
make ubuntu
|
||||||
make prune
|
make prune
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
all :
|
all :
|
||||||
|
make -C debian10
|
||||||
make -C debian11
|
make -C debian11
|
||||||
make -C fedora
|
make -C fedora
|
||||||
make -C ubuntu
|
make -C mint20
|
||||||
make -C mint
|
make -C ubuntu20
|
||||||
|
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
all :
|
|
||||||
sudo docker build -t mozilla/buildenv-mint .
|
|
||||||
2
docker/buildenv/mint20/Makefile
Normal file
2
docker/buildenv/mint20/Makefile
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
all :
|
||||||
|
sudo docker build -t mozilla/buildenv-mint20 .
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
all :
|
|
||||||
sudo docker build -t mozilla/buildenv-ubuntu .
|
|
||||||
2
docker/buildenv/ubuntu20/Makefile
Normal file
2
docker/buildenv/ubuntu20/Makefile
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
all :
|
||||||
|
sudo docker build -t mozilla/buildenv-ubuntu20 .
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
all :
|
all :
|
||||||
|
|
||||||
cp version debian10/version && cp version debian11/version && cp version fedora/version && cp version ubuntu/version && cp version mint/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 ubuntu/version && cp version mint20/version && cp version arch && cp version macos && cp version windows && cp version portable-linux
|
||||||
|
|
||||||
make -C arch
|
make -C arch
|
||||||
make -C macos
|
make -C macos
|
||||||
|
|
@ -12,12 +12,12 @@ all :
|
||||||
make -C debian10
|
make -C debian10
|
||||||
make -C debian11
|
make -C debian11
|
||||||
make -C fedora
|
make -C fedora
|
||||||
make -C mint
|
make -C mint20
|
||||||
make -C ubuntu
|
make -C ubuntu
|
||||||
|
|
||||||
|
|
||||||
clean :
|
clean :
|
||||||
rm -f version debian10/version debian11/version fedora/version ubuntu/version mint/version arch/version macos/version windows/version portable-linux/version
|
rm -f version debian10/version debian11/version fedora/version ubuntu/version mint20/version arch/version macos/version windows/version portable-linux/version
|
||||||
make -C portable-linux clean
|
make -C portable-linux clean
|
||||||
|
|
||||||
build.debian10 :
|
build.debian10 :
|
||||||
|
|
@ -26,8 +26,8 @@ build.debian11 :
|
||||||
make -C debian11
|
make -C debian11
|
||||||
build.fedora :
|
build.fedora :
|
||||||
make -C fedora
|
make -C fedora
|
||||||
build.mint :
|
build.mint20 :
|
||||||
make -C mint
|
make -C mint20
|
||||||
build.ubuntu :
|
build.ubuntu :
|
||||||
make -C ubuntu
|
make -C ubuntu
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
all :
|
|
||||||
sudo docker build -t librewolf/release-mint .
|
|
||||||
make -C deb all
|
|
||||||
|
|
||||||
no-cache :
|
|
||||||
sudo docker build --no-cache -t librewolf/release-mint .
|
|
||||||
make -C deb no-cache
|
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from mozilla/buildenv-mint
|
from mozilla/buildenv-mint20
|
||||||
run rm -rf mozilla-unified
|
run rm -rf mozilla-unified
|
||||||
|
|
||||||
# Build it..
|
# Build it..
|
||||||
8
docker/librewolf/mint20/Makefile
Normal file
8
docker/librewolf/mint20/Makefile
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
all :
|
||||||
|
sudo docker build -t librewolf/release-mint20 .
|
||||||
|
make -C deb all
|
||||||
|
|
||||||
|
no-cache :
|
||||||
|
sudo docker build --no-cache -t librewolf/release-mint20 .
|
||||||
|
make -C deb no-cache
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from librewolf/release-mint
|
from librewolf/release-mint20
|
||||||
run ./build.py --version $(cat /version) lw_artifacts
|
run ./build.py --version $(cat /version) lw_artifacts
|
||||||
run mkdir /artifacts
|
run mkdir /artifacts
|
||||||
run cp librewolf-$(cat /version).en-US.deb.zip /artifacts
|
run cp librewolf-$(cat /version).en-US.deb.zip /artifacts
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
distro = mint
|
distro = mint20
|
||||||
extractor = extract7
|
extractor = extract7
|
||||||
docker_stage = deb-$(distro)
|
docker_stage = deb-$(distro)
|
||||||
version = `cat ../version`
|
version = `cat ../version`
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
all :
|
|
||||||
sudo docker build -t librewolf/release-ubuntu .
|
|
||||||
make -C deb all
|
|
||||||
|
|
||||||
no-cache :
|
|
||||||
sudo docker build --no-cache -t librewolf/release-ubuntu .
|
|
||||||
make -C deb no-cache
|
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from mozilla/buildenv-ubuntu
|
from mozilla/buildenv-ubuntu20
|
||||||
run rm -rf mozilla-unified
|
run rm -rf mozilla-unified
|
||||||
|
|
||||||
# Build it..
|
# Build it..
|
||||||
8
docker/librewolf/ubuntu20/Makefile
Normal file
8
docker/librewolf/ubuntu20/Makefile
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
all :
|
||||||
|
sudo docker build -t librewolf/release-ubuntu20 .
|
||||||
|
make -C deb all
|
||||||
|
|
||||||
|
no-cache :
|
||||||
|
sudo docker build --no-cache -t librewolf/release-ubuntu20 .
|
||||||
|
make -C deb no-cache
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from librewolf/release-ubuntu
|
from librewolf/release-ubuntu20
|
||||||
run ./build.py --version $(cat /version) lw_artifacts
|
run ./build.py --version $(cat /version) lw_artifacts
|
||||||
run mkdir /artifacts
|
run mkdir /artifacts
|
||||||
run cp librewolf-$(cat /version).en-US.deb.zip /artifacts
|
run cp librewolf-$(cat /version).en-US.deb.zip /artifacts
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
distro = ubuntu
|
distro = ubuntu20
|
||||||
extractor = extract4
|
extractor = extract4
|
||||||
docker_stage = deb-$(distro)
|
docker_stage = deb-$(distro)
|
||||||
version = `cat ../version`
|
version = `cat ../version`
|
||||||
Loading…
Add table
Reference in a new issue