Compare commits
15 Commits
Author | SHA1 | Date |
---|---|---|
Malte Jürgens | 084df7f986 | |
Malte Jürgens | 0e6aef968e | |
Malte Jürgens | 0f68c8961c | |
Malte Jürgens | 205459e286 | |
Malte Jürgens | d387c8b79b | |
Malte Jürgens | 7ab15d3bad | |
Malte Jürgens | aa9de3df4e | |
Malte Jürgens | 55d253883b | |
Malte Jürgens | 2984fad8f0 | |
Malte Jürgens | fe287c7789 | |
Malte Jürgens | 572f2726b4 | |
Malte Jürgens | 36b53d8dc8 | |
Malte Jürgens | 0d88305c2d | |
Malte Jürgens | 3f0d8a4ee9 | |
Malte Jürgens | d2f564faef |
|
@ -7,8 +7,6 @@ stages:
|
||||||
Build Docker Images:
|
Build Docker Images:
|
||||||
stage: images
|
stage: images
|
||||||
when: manual
|
when: manual
|
||||||
only:
|
|
||||||
- master
|
|
||||||
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
||||||
# Needed because we aren't using our custom runners here
|
# Needed because we aren't using our custom runners here
|
||||||
services:
|
services:
|
||||||
|
@ -22,7 +20,6 @@ Build Docker Images:
|
||||||
- ubuntu20
|
- ubuntu20
|
||||||
- ubuntu22
|
- ubuntu22
|
||||||
- mint20
|
- mint20
|
||||||
- mint21
|
|
||||||
- fedora35
|
- fedora35
|
||||||
- fedora36
|
- fedora36
|
||||||
- tumbleweed
|
- tumbleweed
|
||||||
|
@ -45,12 +42,13 @@ Build:
|
||||||
- ubuntu20
|
- ubuntu20
|
||||||
- ubuntu22
|
- ubuntu22
|
||||||
- mint20
|
- mint20
|
||||||
- mint21
|
|
||||||
- fedora35
|
- fedora35
|
||||||
- fedora36
|
- fedora36
|
||||||
- tumbleweed
|
- tumbleweed
|
||||||
- macos-x86_64
|
- macos-x86_64
|
||||||
- macos-aarch64
|
- macos-aarch64
|
||||||
|
variables:
|
||||||
|
SOURCE_URL: $SOURCE_URL
|
||||||
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
|
||||||
tags:
|
tags:
|
||||||
- autoscale
|
- autoscale
|
||||||
|
@ -106,8 +104,6 @@ Release:
|
||||||
upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb.sha256sum
|
upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb.sha256sum
|
||||||
upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb
|
upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb
|
||||||
upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
|
upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
|
||||||
upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb
|
|
||||||
upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
|
|
||||||
upload_package librewolf-$FILEVER.fc35.x86_64.rpm
|
upload_package librewolf-$FILEVER.fc35.x86_64.rpm
|
||||||
upload_package librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum
|
upload_package librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum
|
||||||
upload_package librewolf-$FILEVER.fc36.x86_64.rpm
|
upload_package librewolf-$FILEVER.fc36.x86_64.rpm
|
||||||
|
@ -147,12 +143,6 @@ Release:
|
||||||
- name: Linux Mint 20 (sha256sum)
|
- name: Linux Mint 20 (sha256sum)
|
||||||
link_type: other
|
link_type: other
|
||||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
|
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
|
||||||
- name: Linux Mint 21 (deb)
|
|
||||||
link_type: package
|
|
||||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb
|
|
||||||
- name: Linux Mint 21 (sha256sum)
|
|
||||||
link_type: other
|
|
||||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
|
|
||||||
- name: Fedora 35 (rpm)
|
- name: Fedora 35 (rpm)
|
||||||
link_type: package
|
link_type: package
|
||||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm
|
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm
|
||||||
|
@ -219,10 +209,6 @@ Update Repositories:
|
||||||
{
|
{
|
||||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb",
|
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb",
|
||||||
"distros": ["uma", "una"]
|
"distros": ["uma", "una"]
|
||||||
},
|
|
||||||
{
|
|
||||||
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb",
|
|
||||||
"distros": ["vanessa"]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"rpms": [
|
"rpms": [
|
||||||
|
|
44
Makefile
44
Makefile
|
@ -1,4 +1,4 @@
|
||||||
.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind
|
.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind
|
||||||
|
|
||||||
version:=$(shell cat version)
|
version:=$(shell cat version)
|
||||||
release:=$(shell cat release)
|
release:=$(shell cat release)
|
||||||
|
@ -13,18 +13,30 @@ help :
|
||||||
@echo " [update] [prune] - misc."
|
@echo " [update] [prune] - misc."
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "docker targets:"
|
@echo "docker targets:"
|
||||||
@echo " [docker-debian11], [docker-mint20], [docker-mint21]"
|
@echo " [docker-debian11]"
|
||||||
@echo " [docker-ubuntu20], [docker-ubuntu21], [docker-ubuntu22]"
|
@echo " [docker-mint20]"
|
||||||
@echo " [docker-fedora34], [docker-fedora35], [docker-fedora36]"
|
@echo " [docker-ubuntu20]"
|
||||||
@echo " [docker-macos-x86_64], [docker-macos-aarch64]"
|
@echo " [docker-ubuntu21]"
|
||||||
|
@echo " [docker-ubuntu22]"
|
||||||
|
@echo " [docker-fedora34]"
|
||||||
|
@echo " [docker-fedora35]"
|
||||||
|
@echo " [docker-fedora36]"
|
||||||
|
@echo " [docker-macos-x86_64]"
|
||||||
|
@echo " [docker-macos-aarch64]"
|
||||||
@echo " [docker-tumbleweed]"
|
@echo " [docker-tumbleweed]"
|
||||||
@echo " [docker-dind]"
|
@echo " [docker-dind]"
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "build targets:"
|
@echo "build targets:"
|
||||||
@echo " [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
|
@echo " [debian11]"
|
||||||
|
@echo " [mint20]"
|
||||||
|
@echo " [ubuntu20]"
|
||||||
|
@echo " [ubuntu21]"
|
||||||
@echo " [ubuntu22]"
|
@echo " [ubuntu22]"
|
||||||
@echo " [fedora34], [fedora35], [fedora36]"
|
@echo " [fedora34]"
|
||||||
@echo " [macos-x64_64], [macos-aarch64]"
|
@echo " [fedora35]"
|
||||||
|
@echo " [fedora36]"
|
||||||
|
@echo " [macos-x64_64]"
|
||||||
|
@echo " [macos-aarch64]"
|
||||||
@echo " [tumbleweed]"
|
@echo " [tumbleweed]"
|
||||||
@echo " [tarball]"
|
@echo " [tarball]"
|
||||||
@echo ""
|
@echo ""
|
||||||
|
@ -42,7 +54,7 @@ veryclean : clean
|
||||||
prune :
|
prune :
|
||||||
docker system prune --all --force
|
docker system prune --all --force
|
||||||
|
|
||||||
docker : docker-debian11 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
|
docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
|
||||||
|
|
||||||
build :
|
build :
|
||||||
${MAKE} clean
|
${MAKE} clean
|
||||||
|
@ -50,8 +62,6 @@ build :
|
||||||
${MAKE} clean
|
${MAKE} clean
|
||||||
${MAKE} mint20
|
${MAKE} mint20
|
||||||
${MAKE} clean
|
${MAKE} clean
|
||||||
${MAKE} mint21
|
|
||||||
${MAKE} clean
|
|
||||||
${MAKE} ubuntu20
|
${MAKE} ubuntu20
|
||||||
${MAKE} clean
|
${MAKE} clean
|
||||||
${MAKE} ubuntu21
|
${MAKE} ubuntu21
|
||||||
|
@ -74,7 +84,6 @@ build :
|
||||||
push :
|
push :
|
||||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
|
docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
|
||||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint20
|
docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint20
|
||||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint21
|
|
||||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
|
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
|
||||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
|
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
|
||||||
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
|
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
|
||||||
|
@ -89,7 +98,6 @@ push :
|
||||||
rmi :
|
rmi :
|
||||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
|
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
|
||||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint20
|
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint20
|
||||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint21
|
|
||||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
|
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
|
||||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
|
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
|
||||||
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
|
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
|
||||||
|
@ -114,13 +122,9 @@ update :
|
||||||
## setting up the work folder
|
## setting up the work folder
|
||||||
tarball=librewolf-$(version)-$(source_release).source.tar.gz
|
tarball=librewolf-$(version)-$(source_release).source.tar.gz
|
||||||
$(tarball) :
|
$(tarball) :
|
||||||
ifeq ($(SOURCE_URL),)
|
|
||||||
wget -q -O $(tarball) "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$(version)-$(source_release)/$(tarball)"
|
wget -q -O $(tarball) "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$(version)-$(source_release)/$(tarball)"
|
||||||
wget -q -O $(tarball).sha256sum "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$(version)-$(source_release)/$(tarball).sha256sum"
|
wget -q -O $(tarball).sha256sum "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$(version)-$(source_release)/$(tarball).sha256sum"
|
||||||
sha256sum -c $(tarball).sha256sum
|
sha256sum -c $(tarball).sha256sum
|
||||||
else
|
|
||||||
wget -q -O $(tarball) "$(SOURCE_URL)"
|
|
||||||
endif
|
|
||||||
work : $(tarball)
|
work : $(tarball)
|
||||||
mkdir work
|
mkdir work
|
||||||
(cd work && tar xf ../$(tarball))
|
(cd work && tar xf ../$(tarball))
|
||||||
|
@ -144,12 +148,6 @@ docker-mint20 :
|
||||||
mint20 :
|
mint20 :
|
||||||
${MAKE} -f assets/linux.mk distro=mint20 build
|
${MAKE} -f assets/linux.mk distro=mint20 build
|
||||||
${MAKE} -f assets/linux.artifacts.mk distro=mint20 artifacts-deb
|
${MAKE} -f assets/linux.artifacts.mk distro=mint20 artifacts-deb
|
||||||
## mint21
|
|
||||||
docker-mint21 :
|
|
||||||
${MAKE} -f assets/linux.mk distro=mint21 "distro_image=linuxmintd/mint21-amd64" docker
|
|
||||||
mint21 :
|
|
||||||
${MAKE} -f assets/linux.mk distro=mint21 build
|
|
||||||
${MAKE} -f assets/linux.artifacts.mk distro=mint21 artifacts-deb
|
|
||||||
## ubuntu20
|
## ubuntu20
|
||||||
docker-ubuntu20 :
|
docker-ubuntu20 :
|
||||||
${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:focal" docker
|
${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:focal" docker
|
||||||
|
|
19
README.md
19
README.md
|
@ -9,16 +9,15 @@ scripts.
|
||||||
|
|
||||||
## <a id="targets"></a> Supported Targets
|
## <a id="targets"></a> Supported Targets
|
||||||
|
|
||||||
| Platform | x86_64 | aarch64 |
|
| Platform | x86_64 | aarch64 |
|
||||||
| ----------------- | ----------------------- | ------------------ |
|
| --------------- | --------------------------------- | ------------------ |
|
||||||
| Linux | | |
|
| Linux | | |
|
||||||
| └─ Debian (deb) | ✅ (debian11) | - |
|
| └─ Debian (deb) | ✅ (debian11) | - |
|
||||||
| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu22) | - |
|
| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu21, ubuntu22) | - |
|
||||||
| └─ Mint (deb) | ✅ (mint20, mint21) | - |
|
| └─ Mint (deb) | ✅ (mint20) | - |
|
||||||
| └─ Fedora (rpm) | ✅ (fedora35, fedora36) | - |
|
| └─ Fedora (rpm) | ✅ (fedora35, fedora36) | - |
|
||||||
| └─ openSUSE (rpm) | ✅ (tumbleweed) | - |
|
| MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |
|
||||||
| MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |
|
| Windows | _WIP_ | - |
|
||||||
| Windows | _WIP_ | - |
|
|
||||||
|
|
||||||
## Running bsys5 Locally
|
## Running bsys5 Locally
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@ Summary: The LibreWolf browser
|
||||||
License: MPL
|
License: MPL
|
||||||
URL: https://librewolf-community.gitlab.io/
|
URL: https://librewolf-community.gitlab.io/
|
||||||
Source0: lw.tar.gz
|
Source0: lw.tar.gz
|
||||||
Distribution: %(source /etc/os-release && echo $PRETTY_NAME)
|
|
||||||
#BuildRequires:
|
#BuildRequires:
|
||||||
#Requires:
|
#Requires:
|
||||||
%description
|
%description
|
||||||
|
|
|
@ -35,13 +35,12 @@ RUN ./mach artifact toolchain --from-build linux64-libdmg
|
||||||
RUN ./mach artifact toolchain --from-build linux64-cctools-port
|
RUN ./mach artifact toolchain --from-build linux64-cctools-port
|
||||||
RUN ./mach artifact toolchain --from-build linux64-hfsplus
|
RUN ./mach artifact toolchain --from-build linux64-hfsplus
|
||||||
RUN ./mach artifact toolchain --from-build linux64-binutils
|
RUN ./mach artifact toolchain --from-build linux64-binutils
|
||||||
RUN ./mach artifact toolchain --from-build sysroot-wasm32-wasi
|
RUN dir="$PWD" && cd /root/.mozbuild && "$dir/mach" artifact toolchain --from-build sysroot-wasm32-wasi
|
||||||
## RUN ./mach artifact toolchain --from-build linux64-clang-macosx-cross
|
## RUN ./mach artifact toolchain --from-build linux64-clang-macosx-cross
|
||||||
RUN /root/.cargo/bin/cargo install cbindgen
|
RUN /root/.cargo/bin/cargo install cbindgen
|
||||||
RUN /root/.cargo/bin/rustup target add $arch-apple-darwin
|
RUN /root/.cargo/bin/rustup target add $arch-apple-darwin
|
||||||
RUN cp -r binutils /root/.mozbuild
|
RUN cp -r binutils /root/.mozbuild
|
||||||
RUN cp -r cctools /root/.mozbuild
|
RUN cp -r cctools /root/.mozbuild
|
||||||
RUN cp -r sysroot-wasm32-wasi /root/.mozbuild
|
|
||||||
## RUN cp -r clang /root/.mozbuild
|
## RUN cp -r clang /root/.mozbuild
|
||||||
RUN cp -r dmg /root/.mozbuild
|
RUN cp -r dmg /root/.mozbuild
|
||||||
RUN cp -r hfsplus-tools /root/.mozbuild
|
RUN cp -r hfsplus-tools /root/.mozbuild
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
1
|
4
|
||||||
|
|
Loading…
Reference in New Issue