Compare commits

...

23 commits

Author SHA1 Message Date
Bert van der Weerd
bdee933bb7
v116.0.2-1 2023-08-09 09:30:54 +02:00
Bert van der Weerd
cd229782af
bump to v116.0-1 2023-08-02 00:43:35 +02:00
Bert van der Weerd
cb0418a125
release v115.0.2-2 2023-07-12 14:51:03 +02:00
Bert van der Weerd
8f607da74f
v115.0.2-1 builds 2023-07-12 13:40:27 +02:00
Bert van der Weerd
ecbc75b72c
removed macOS from builds. v6 will now build macOS instead 2023-07-10 15:33:14 +02:00
e6d0d3a00e
115.0.1-1 2023-07-09 22:55:22 +02:00
stanzabird
a09088b453 115.0 2023-07-08 20:10:06 +00:00
Bert van der Weerd
af044e3304
Merge branch 'master' of gitlab.com:librewolf-community/browser/bsys5 2023-06-23 13:21:36 +02:00
Bert van der Weerd
083f14d8c7
update to version 114.0.2-1 2023-06-23 13:21:26 +02:00
f4dfbce94b
fix ci 2023-06-15 23:20:50 +02:00
fa50ab2279
114.0.1-2-2 2023-06-12 19:02:42 +02:00
8e511a8753
fix missing dpkg-sig 2023-06-12 19:02:02 +02:00
b737e5783f
add debian 12 target 2023-06-11 10:30:37 +02:00
Bert van der Weerd
4070c5bdeb
bump to 114.0.1-2 2023-06-10 10:57:35 +02:00
Bert van der Weerd
e199efddca
bump version to 114.0.1-1 2023-06-10 01:35:54 +02:00
Bert van der Weerd
383f413bba
remove some tool binaries we dont want 2023-06-09 19:35:11 +02:00
Bert van der Weerd
1f6f06e9b4
bump version to 114.0-1 2023-06-09 12:55:45 +02:00
Bert van der Weerd
8d716372e7 bump to 113.02 2023-05-31 13:21:22 +02:00
5b6e193b9a
add fedora38, remove fedora36 2023-05-28 10:15:46 +02:00
Bert van der Weerd
d8abb1279e
bump to version 113.0.1 2023-05-22 15:59:28 +02:00
Bert van der Weerd
a29404f692 fix merge conflict 2023-05-11 14:10:42 +02:00
Bert van der Weerd
ab018ea341 bump verison to 113.0-1 2023-05-11 14:09:19 +02:00
stanzabird
d3385ccd8f Update 2 files
- /source_release
- /version
2023-04-30 11:24:34 +00:00
9 changed files with 69 additions and 59 deletions

View file

@ -15,19 +15,20 @@ Images:
matrix:
- DISTRO:
- debian11
- debian12
- ubuntu20
- ubuntu22
- mint20
- mint21
- fedora37
- fedora36
- macos-x86_64
- macos-aarch64
- fedora38
- dind
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
registry.gitlab.com
- make docker-$DISTRO
- docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
- docker push
registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
Build:
stage: build
@ -37,14 +38,13 @@ Build:
matrix:
- DISTRO:
- debian11
- debian12
- ubuntu20
- ubuntu22
- mint20
- mint21
- fedora37
- fedora36
- macos-x86_64
- macos-aarch64
- fedora38
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
tags:
- autoscale
@ -55,15 +55,13 @@ Build:
- echo VERSION=$(cat version) >> variables.env
- echo RELEASE=$(cat release) >> variables.env
- echo SOURCE_RELEASE=$(cat source_release) >> variables.env
- "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
- "t=$(cat version)-$(cat source_release) ; if ! grep 1 release; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
artifacts:
paths:
- librewolf-*.deb
- librewolf-*.deb.sha256sum
- librewolf-*.rpm
- librewolf-*.rpm.sha256sum
- librewolf-*.dmg
- librewolf-*.dmg.sha256sum
- librewolf-*-setup.exe
- librewolf-*-setup.exe.sha256sum
- librewolf-*-portable.zip
@ -86,7 +84,8 @@ Release:
before_script:
- apt-get update
- apt-get install -y curl
- curl -L --output /usr/local/bin/release-cli "https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
- curl -L --output /usr/local/bin/release-cli
"https://release-cli-downloads.s3.amazonaws.com/latest/release-cli-linux-amd64"
- chmod +x /usr/local/bin/release-cli
script:
- |
@ -103,6 +102,8 @@ Release:
upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb
upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
upload_package librewolf-$FILEVER.en-US.debian12.x86_64.deb
upload_package librewolf-$FILEVER.en-US.debian12.x86_64.deb.sha256sum
upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb
@ -113,12 +114,8 @@ Release:
upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
upload_package librewolf-$FILEVER.fc37.x86_64.rpm
upload_package librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
upload_package librewolf-$FILEVER.fc36.x86_64.rpm
upload_package librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg
upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg
upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
upload_package librewolf-$FILEVER.fc38.x86_64.rpm
upload_package librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum
echo "Creating Codeberg release"
codeberg_release_body="${codeberg_release_body}\n[View on GitLab](https://gitlab.com/librewolf-community/browser/bsys5/-/releases/$FILEVER)"
@ -140,6 +137,10 @@ Release:
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
"distros": ["bullseye"]
},
{
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb",
"distros": ["bookworm"]
},
{
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
"distros": ["focal"]
@ -162,7 +163,7 @@ Release:
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm"
},
{
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm"
"file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm"
}
]
}
@ -174,7 +175,10 @@ Release:
echo "Submitted update request to LibreWolf Software Repository (https://updaterepos.librewolf.net/job?id=$id)"
release:
tag_name: "$FILEVER"
description: "## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
description:
"## LibreWolf bsys5 Release v$FILEVER\n\n- \n\n(Built on GitLab by
pipeline
[$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"
assets:
links:
- name: Debian 11 (deb)
@ -183,6 +187,12 @@ Release:
- name: Debian 11 (sha256sum)
link_type: other
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
- name: Debian 12 (deb)
link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb
- name: Debian 12 (sha256sum)
link_type: other
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian12.x86_64.deb.sha256sum
- name: Ubuntu 20 (deb)
link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
@ -213,21 +223,9 @@ Release:
- name: Fedora 37 (sha256sum)
link_type: other
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
- name: Fedora 36 (rpm)
- name: Fedora 38 (rpm)
link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm
- name: Fedora 36 (sha256sum)
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm
- name: Fedora 38 (sha256sum)
link_type: other
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
- name: macOS x86_64 (dmg)
link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg
- name: macOS x86_64 (sha256sum)
link_type: other
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
- name: macOS aarch64 (dmg)
link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg
- name: macOS aarch64 (sha256sum)
link_type: other
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.aarch64.dmg.sha256sum
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm.sha256sum

View file

@ -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-fedora37 fedora37 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows
.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-fedora37 fedora37 docker-fedora38 fedora38 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows
version:=$(shell cat version)
release:=$(shell cat release)
@ -13,18 +13,18 @@ help :
@echo " [update] [prune] - misc."
@echo ""
@echo "docker targets:"
@echo " [docker-debian11], [docker-mint20], [docker-mint21]"
@echo " [docker-debian11], [docker-debian12],[docker-mint20], [docker-mint21]"
@echo " [docker-ubuntu20], [docker-ubuntu21], [docker-ubuntu22]"
@echo " [docker-fedora37], [docker-fedora36]"
@echo " [docker-fedora37], [docker-fedora38]"
@echo " [docker-macos-x86_64], [docker-macos-aarch64]"
@echo " [docker-tumbleweed]"
@echo " [docker-dind]"
@echo " [docker-windows]"
@echo ""
@echo "build targets:"
@echo " [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
@echo " [debian11], [debian12], [mint20], [mint21], [ubuntu20], [ubuntu21]"
@echo " [ubuntu22]"
@echo " [fedora37], [fedora36]"
@echo " [fedora37], [fedora38]"
@echo " [macos-x64_64], [macos-aarch64]"
@echo " [tumbleweed]"
@echo " [windows]"
@ -44,12 +44,14 @@ veryclean : clean
prune :
docker system prune --all --force
docker : docker-debian11 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
docker : docker-debian11 docker-debian12 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora37 docker-fedora38 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
build :
${MAKE} clean
${MAKE} debian11
${MAKE} clean
${MAKE} debian12
${MAKE} clean
${MAKE} mint20
${MAKE} clean
${MAKE} mint21
@ -64,7 +66,7 @@ build :
${MAKE} clean
${MAKE} fedora37
${MAKE} clean
${MAKE} fedora36
${MAKE} fedora38
${MAKE} clean
${MAKE} tumbleweed
${MAKE} clean
@ -77,6 +79,7 @@ build :
push :
docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian12
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
@ -84,7 +87,7 @@ push :
docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora37
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora38
docker push registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
@ -92,6 +95,7 @@ push :
rmi :
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian12
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
@ -99,7 +103,7 @@ rmi :
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora37
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora38
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
@ -142,6 +146,12 @@ docker-debian11 :
debian11 :
${MAKE} -f assets/linux.mk distro=debian11 build
${MAKE} -f assets/linux.artifacts.mk distro=debian11 artifacts-deb
## debian12
docker-debian12 :
${MAKE} -f assets/linux.mk distro=debian12 "distro_image=debian:bookworm" docker
debian12 :
${MAKE} -f assets/linux.mk distro=debian12 build
${MAKE} -f assets/linux.artifacts.mk distro=debian12 artifacts-deb
## mint20
docker-mint20 :
${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
@ -178,12 +188,12 @@ docker-fedora37 :
fedora37 :
${MAKE} -f assets/linux.mk distro=fedora37 build
${MAKE} -f assets/linux.artifacts.mk fc=fc37 distro=fedora37 artifacts-rpm
## fedora36
docker-fedora36 :
${MAKE} -f assets/linux.mk distro=fedora36 "distro_image=fedora:36" docker
fedora36 :
${MAKE} -f assets/linux.mk distro=fedora36 build
${MAKE} -f assets/linux.artifacts.mk fc=fc36 distro=fedora36 artifacts-rpm
## fedora38
docker-fedora38 :
${MAKE} -f assets/linux.mk distro=fedora38 "distro_image=fedora:38" docker
fedora38 :
${MAKE} -f assets/linux.mk distro=fedora38 build
${MAKE} -f assets/linux.artifacts.mk fc=fc38 distro=fedora38 artifacts-rpm
## opensuse tumbleweed
docker-tumbleweed :
${MAKE} -f assets/linux.mk distro=tumbleweed "distro_image=opensuse/tumbleweed" docker

View file

@ -12,10 +12,10 @@ scripts.
| Platform | x86_64 | aarch64 |
| ------------------------ | ----------------------- | ------------------ |
| Linux | | |
| └─ Debian (deb) | ✅ (debian11) | - |
| └─ Debian (deb) | ✅ (debian11,debian12) | - |
| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu22) | - |
| └─ Mint (deb) | ✅ (mint20, mint21) | - |
| └─ Fedora (rpm) | ✅ (fedora36, fedora37) | - |
| └─ Fedora (rpm) | ✅ (fedora38, fedora37) | - |
| └─ openSUSE (rpm) | ✅ (tumbleweed) | - |
| MacOS (dmg) | ✅ (macos-x64_64) | ✅ (macos-aarch64) |
| Windows (setup,portable) | ✅ (windows) | - |

View file

@ -14,7 +14,7 @@ ENV TZ=Europe/Amsterdam
# dependencies needed to run ./mach bootstrap
RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true)
RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget ; apt-get -y install dpkg-sig; true)
RUN ( dnf -y upgrade && dnf -y install python3 python3-devel gcc wget rpm-build rpm-sign ; true)
RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ; true)

View file

@ -47,8 +47,8 @@ cp -v ../librewolf.desktop usr/share/applications/librewolf.desktop
cd ..
dpkg-deb --build librewolf
# Sign the deb file if private key is provided
if [[ -f pk.asc ]]; then
# Sign the deb file if private key is provided and we have dpkg-sig available
if [[ -f pk.asc ]] && command -v dpkg-sig &>/dev/null; then
gpg --import pk.asc
dpkg-sig --sign builder librewolf.deb
fi

View file

@ -43,6 +43,9 @@ rm -rf /usr/src && ln -sv /WORK /usr/src # Required for openSUSE
sed "s/__VERSION__/$version/g" </work/librewolf.spec >/work/tmp.spec
sed "s/__RELEASE__/$full_release/g" </work/tmp.spec >rpmbuild/SPECS/librewolf.spec
# fix: remove some tool binaries we don't want
rm -f /work/librewolf/{glxtest,vaapitest}
# copy in the librewolf assets
cp -rv /work/librewolf rpmbuild/SOURCES

View file

@ -32,7 +32,6 @@ RUN echo ac_add_options --enable-bootstrap >> mozconfig
RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX13.0.sdk >> mozconfig
RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
RUN ./mach artifact toolchain --from-build linux64-libdmg
RUN ./mach artifact toolchain --from-build linux64-cctools-port
RUN ./mach artifact toolchain --from-build linux64-hfsplus

View file

@ -1 +1 @@
2
1

View file

@ -1 +1 @@
112.0.1
116.0.2