diff --git a/.gitignore b/.gitignore index 2ba9425..8f28789 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,5 @@ build_tag /docker/librewolf/debian10/deb/artifacts /docker/librewolf/debian11/deb/artifacts /docker/librewolf/fedora/rpm/artifacts -/docker/librewolf/mint/deb/artifacts -/docker/librewolf/ubuntu/deb/artifacts +/docker/librewolf/mint20/deb/artifacts +/docker/librewolf/ubuntu20/deb/artifacts diff --git a/docker/Makefile b/docker/Makefile index c6162fd..dd9d8f0 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -42,10 +42,10 @@ fedora : make -C buildenv/fedora cp version librewolf/fedora make -C librewolf/fedora -mint : - make -C buildenv/mint - cp version librewolf/mint - make -C librewolf/mint +mint20 : + make -C buildenv/mint20 + cp version librewolf/mint20 + make -C librewolf/mint20 ubuntu : make -C buildenv/ubuntu cp version librewolf/ubuntu @@ -61,7 +61,7 @@ low_disk : make prune make fedora make prune - make mint + make mint20 make prunt make ubuntu make prune diff --git a/docker/buildenv/Makefile b/docker/buildenv/Makefile index 8560897..f24a792 100644 --- a/docker/buildenv/Makefile +++ b/docker/buildenv/Makefile @@ -1,5 +1,6 @@ all : + make -C debian10 make -C debian11 make -C fedora - make -C ubuntu - make -C mint + make -C mint20 + make -C ubuntu20 diff --git a/docker/buildenv/mint/Makefile b/docker/buildenv/mint/Makefile deleted file mode 100644 index 673dc8c..0000000 --- a/docker/buildenv/mint/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all : - sudo docker build -t mozilla/buildenv-mint . diff --git a/docker/buildenv/mint/Dockerfile b/docker/buildenv/mint20/Dockerfile similarity index 100% rename from docker/buildenv/mint/Dockerfile rename to docker/buildenv/mint20/Dockerfile diff --git a/docker/buildenv/mint20/Makefile b/docker/buildenv/mint20/Makefile new file mode 100644 index 0000000..05780de --- /dev/null +++ b/docker/buildenv/mint20/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/buildenv-mint20 . diff --git a/docker/buildenv/ubuntu/Makefile b/docker/buildenv/ubuntu/Makefile deleted file mode 100644 index 08555f4..0000000 --- a/docker/buildenv/ubuntu/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all : - sudo docker build -t mozilla/buildenv-ubuntu . diff --git a/docker/buildenv/ubuntu/Dockerfile b/docker/buildenv/ubuntu20/Dockerfile similarity index 100% rename from docker/buildenv/ubuntu/Dockerfile rename to docker/buildenv/ubuntu20/Dockerfile diff --git a/docker/buildenv/ubuntu20/Makefile b/docker/buildenv/ubuntu20/Makefile new file mode 100644 index 0000000..d28192e --- /dev/null +++ b/docker/buildenv/ubuntu20/Makefile @@ -0,0 +1,2 @@ +all : + sudo docker build -t mozilla/buildenv-ubuntu20 . diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile index 8cdd021..f41d61c 100644 --- a/docker/librewolf/Makefile +++ b/docker/librewolf/Makefile @@ -2,7 +2,7 @@ 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 macos @@ -12,12 +12,12 @@ all : make -C debian10 make -C debian11 make -C fedora - make -C mint + make -C mint20 make -C ubuntu 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 build.debian10 : @@ -26,8 +26,8 @@ build.debian11 : make -C debian11 build.fedora : make -C fedora -build.mint : - make -C mint +build.mint20 : + make -C mint20 build.ubuntu : make -C ubuntu diff --git a/docker/librewolf/mint/Makefile b/docker/librewolf/mint/Makefile deleted file mode 100644 index 05c4a69..0000000 --- a/docker/librewolf/mint/Makefile +++ /dev/null @@ -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 - diff --git a/docker/librewolf/mint/.gitignore b/docker/librewolf/mint20/.gitignore similarity index 100% rename from docker/librewolf/mint/.gitignore rename to docker/librewolf/mint20/.gitignore diff --git a/docker/librewolf/mint/Dockerfile b/docker/librewolf/mint20/Dockerfile similarity index 96% rename from docker/librewolf/mint/Dockerfile rename to docker/librewolf/mint20/Dockerfile index 68bd223..8faf6f7 100644 --- a/docker/librewolf/mint/Dockerfile +++ b/docker/librewolf/mint20/Dockerfile @@ -1,4 +1,4 @@ -from mozilla/buildenv-mint +from mozilla/buildenv-mint20 run rm -rf mozilla-unified # Build it.. diff --git a/docker/librewolf/mint20/Makefile b/docker/librewolf/mint20/Makefile new file mode 100644 index 0000000..1658935 --- /dev/null +++ b/docker/librewolf/mint20/Makefile @@ -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 + diff --git a/docker/librewolf/mint/deb/Dockerfile b/docker/librewolf/mint20/deb/Dockerfile similarity index 88% rename from docker/librewolf/mint/deb/Dockerfile rename to docker/librewolf/mint20/deb/Dockerfile index 1b166a0..5608ad1 100644 --- a/docker/librewolf/mint/deb/Dockerfile +++ b/docker/librewolf/mint20/deb/Dockerfile @@ -1,4 +1,4 @@ -from librewolf/release-mint +from librewolf/release-mint20 run ./build.py --version $(cat /version) lw_artifacts run mkdir /artifacts run cp librewolf-$(cat /version).en-US.deb.zip /artifacts diff --git a/docker/librewolf/mint/deb/Makefile b/docker/librewolf/mint20/deb/Makefile similarity index 98% rename from docker/librewolf/mint/deb/Makefile rename to docker/librewolf/mint20/deb/Makefile index cdf869b..ef9f4a8 100644 --- a/docker/librewolf/mint/deb/Makefile +++ b/docker/librewolf/mint20/deb/Makefile @@ -1,4 +1,4 @@ -distro = mint +distro = mint20 extractor = extract7 docker_stage = deb-$(distro) version = `cat ../version` diff --git a/docker/librewolf/mint/deb/build-deb.sh b/docker/librewolf/mint20/deb/build-deb.sh similarity index 100% rename from docker/librewolf/mint/deb/build-deb.sh rename to docker/librewolf/mint20/deb/build-deb.sh diff --git a/docker/librewolf/ubuntu/Makefile b/docker/librewolf/ubuntu/Makefile deleted file mode 100644 index 07877ab..0000000 --- a/docker/librewolf/ubuntu/Makefile +++ /dev/null @@ -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 - diff --git a/docker/librewolf/ubuntu/.gitignore b/docker/librewolf/ubuntu20/.gitignore similarity index 100% rename from docker/librewolf/ubuntu/.gitignore rename to docker/librewolf/ubuntu20/.gitignore diff --git a/docker/librewolf/ubuntu/Dockerfile b/docker/librewolf/ubuntu20/Dockerfile similarity index 95% rename from docker/librewolf/ubuntu/Dockerfile rename to docker/librewolf/ubuntu20/Dockerfile index 58ebf3c..ce318d0 100644 --- a/docker/librewolf/ubuntu/Dockerfile +++ b/docker/librewolf/ubuntu20/Dockerfile @@ -1,4 +1,4 @@ -from mozilla/buildenv-ubuntu +from mozilla/buildenv-ubuntu20 run rm -rf mozilla-unified # Build it.. diff --git a/docker/librewolf/ubuntu20/Makefile b/docker/librewolf/ubuntu20/Makefile new file mode 100644 index 0000000..b150dcd --- /dev/null +++ b/docker/librewolf/ubuntu20/Makefile @@ -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 + diff --git a/docker/librewolf/ubuntu/deb/Dockerfile b/docker/librewolf/ubuntu20/deb/Dockerfile similarity index 88% rename from docker/librewolf/ubuntu/deb/Dockerfile rename to docker/librewolf/ubuntu20/deb/Dockerfile index 45850da..46b7516 100644 --- a/docker/librewolf/ubuntu/deb/Dockerfile +++ b/docker/librewolf/ubuntu20/deb/Dockerfile @@ -1,4 +1,4 @@ -from librewolf/release-ubuntu +from librewolf/release-ubuntu20 run ./build.py --version $(cat /version) lw_artifacts run mkdir /artifacts run cp librewolf-$(cat /version).en-US.deb.zip /artifacts diff --git a/docker/librewolf/ubuntu/deb/Makefile b/docker/librewolf/ubuntu20/deb/Makefile similarity index 98% rename from docker/librewolf/ubuntu/deb/Makefile rename to docker/librewolf/ubuntu20/deb/Makefile index 9d312b8..75721f3 100644 --- a/docker/librewolf/ubuntu/deb/Makefile +++ b/docker/librewolf/ubuntu20/deb/Makefile @@ -1,4 +1,4 @@ -distro = ubuntu +distro = ubuntu20 extractor = extract4 docker_stage = deb-$(distro) version = `cat ../version` diff --git a/docker/librewolf/ubuntu/deb/build-deb.sh b/docker/librewolf/ubuntu20/deb/build-deb.sh similarity index 100% rename from docker/librewolf/ubuntu/deb/build-deb.sh rename to docker/librewolf/ubuntu20/deb/build-deb.sh