Compare commits

...

13 Commits

Author SHA1 Message Date
Bert van der Weerd 342da45bc2
made help message more compact 2022-08-13 11:48:48 +02:00
Malte Jürgens 4832eb0208
update to 103.0.2-1 2022-08-09 23:41:16 +02:00
Malte Jürgens 5c385c24ce
add mint21 target 2022-08-07 21:19:44 +02:00
Bert van der Weerd f3febe32ca
Merge branch 'master' of gitlab.com:librewolf-community/browser/bsys5 2022-08-05 13:19:09 +02:00
Bert van der Weerd ce966941fe
v103.0.1 2022-08-05 13:19:01 +02:00
Malte Jürgens 25dbc8f9bc
fix error in gitlab ci 2022-07-29 14:24:42 +02:00
stanzabird a1831bf856 Update Makefile 2022-07-29 09:16:26 +00:00
Bert van der Weerd f65583f9bb
updated source_release 2022-07-29 10:15:05 +02:00
Malte Jürgens b064e0d184
allow for custom SOURCE_URL 2022-07-29 01:39:02 +02:00
Bert van der Weerd 831d38ad97
v103.0-2 2022-07-28 15:45:44 +02:00
Bert van der Weerd 016c20f0ac
Mon 25 Jul 2022 05:43:02 PM CEST 2022-07-25 17:43:02 +02:00
Malte Jürgens 46f1bf0851
add `Distribution` header to rpm specfile 2022-07-24 14:21:09 +02:00
Malte Jürgens 660c1bb4c3
update target table 2022-07-23 22:02:29 +02:00
6 changed files with 50 additions and 34 deletions

View File

@ -22,6 +22,7 @@ Build Docker Images:
- ubuntu20
- ubuntu22
- mint20
- mint21
- fedora35
- fedora36
- tumbleweed
@ -44,13 +45,12 @@ Build:
- ubuntu20
- ubuntu22
- mint20
- mint21
- fedora35
- fedora36
- tumbleweed
- macos-x86_64
- macos-aarch64
variables:
SOURCE_URL: $SOURCE_URL
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
tags:
- autoscale
@ -106,6 +106,8 @@ Release:
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.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.sha256sum
upload_package librewolf-$FILEVER.fc36.x86_64.rpm
@ -145,6 +147,12 @@ Release:
- name: Linux Mint 20 (sha256sum)
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
- 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)
link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm
@ -211,6 +219,10 @@ Update Repositories:
{
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb",
"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": [

View File

@ -1,4 +1,4 @@
.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
.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
version:=$(shell cat version)
release:=$(shell cat release)
@ -13,30 +13,18 @@ help :
@echo " [update] [prune] - misc."
@echo ""
@echo "docker targets:"
@echo " [docker-debian11]"
@echo " [docker-mint20]"
@echo " [docker-ubuntu20]"
@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-debian11], [docker-mint20], [docker-mint21]"
@echo " [docker-ubuntu20], [docker-ubuntu21], [docker-ubuntu22]"
@echo " [docker-fedora34], [docker-fedora35], [docker-fedora36]"
@echo " [docker-macos-x86_64], [docker-macos-aarch64]"
@echo " [docker-tumbleweed]"
@echo " [docker-dind]"
@echo ""
@echo "build targets:"
@echo " [debian11]"
@echo " [mint20]"
@echo " [ubuntu20]"
@echo " [ubuntu21]"
@echo " [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
@echo " [ubuntu22]"
@echo " [fedora34]"
@echo " [fedora35]"
@echo " [fedora36]"
@echo " [macos-x64_64]"
@echo " [macos-aarch64]"
@echo " [fedora34], [fedora35], [fedora36]"
@echo " [macos-x64_64], [macos-aarch64]"
@echo " [tumbleweed]"
@echo " [tarball]"
@echo ""
@ -54,7 +42,7 @@ veryclean : clean
prune :
docker system prune --all --force
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
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
build :
${MAKE} clean
@ -62,6 +50,8 @@ build :
${MAKE} clean
${MAKE} mint20
${MAKE} clean
${MAKE} mint21
${MAKE} clean
${MAKE} ubuntu20
${MAKE} clean
${MAKE} ubuntu21
@ -84,6 +74,7 @@ build :
push :
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/mint21
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/ubuntu22
@ -98,6 +89,7 @@ push :
rmi :
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/mint21
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/ubuntu22
@ -122,9 +114,13 @@ update :
## setting up the work folder
tarball=librewolf-$(version)-$(source_release).source.tar.gz
$(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).sha256sum "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$(version)-$(source_release)/$(tarball).sha256sum"
sha256sum -c $(tarball).sha256sum
else
wget -q -O $(tarball) "$(SOURCE_URL)"
endif
work : $(tarball)
mkdir work
(cd work && tar xf ../$(tarball))
@ -148,6 +144,12 @@ docker-mint20 :
mint20 :
${MAKE} -f assets/linux.mk distro=mint20 build
${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
docker-ubuntu20 :
${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:focal" docker

View File

@ -9,15 +9,16 @@ scripts.
## <a id="targets"></a> Supported Targets
| Platform | x86_64 | aarch64 |
| --------------- | --------------------------------- | ------------------ |
| Linux | | |
| └─ Debian (deb) | ✅ (debian11) | - |
| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu21, ubuntu22) | - |
| └─ Mint (deb) | ✅ (mint20) | - |
| └─ Fedora (rpm) | ✅ (fedora35, fedora36) | - |
| MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |
| Windows | _WIP_ | - |
| Platform | x86_64 | aarch64 |
| ----------------- | ----------------------- | ------------------ |
| Linux | | |
| └─ Debian (deb) | ✅ (debian11) | - |
| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu22) | - |
| └─ Mint (deb) | ✅ (mint20, mint21) | - |
| └─ Fedora (rpm) | ✅ (fedora35, fedora36) | - |
| └─ openSUSE (rpm) | ✅ (tumbleweed) | - |
| MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |
| Windows | _WIP_ | - |
## Running bsys5 Locally

View File

@ -6,6 +6,7 @@ Summary: The LibreWolf browser
License: MPL
URL: https://librewolf-community.gitlab.io/
Source0: lw.tar.gz
Distribution: %(source /etc/os-release && echo $PRETTY_NAME)
#BuildRequires:
#Requires:
%description

View File

@ -1 +1 @@
4
1

View File

@ -1 +1 @@
102.0.1
103.0.2