Compare commits

...

27 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
9985e3de44
112.0.1-2 2023-04-19 01:21:11 +02:00
Bert van der Weerd
3aafd846ab
bump to 112.0-2 2023-04-17 13:06:16 +02:00
7a4b5f652e Merge branch 'rename-librewolf-desktop' into 'master'
Rename start-librewolf.desktop to librewolf.desktop

See merge request librewolf-community/browser/bsys5!17
2023-04-14 19:02:42 +00:00
Kelvin M. Klann
06af8517f2 Rename start-librewolf.desktop to librewolf.desktop
So that it matches the executable name (/usr/bin/librewolf) and the
filename used in the FAQ (librewolf.desktop)[1].

This also makes the filename consistent with the one used on other
platforms (such as on Arch Linux[2]) and with what is used by Firefox
(firefox.desktop).

Commands used to search and replace:

    $ git grep -Flz start-librewolf.desktop | xargs -0 -I '{}' sh -c \
      "printf '%s\n' \"\$(sed \
        's/start-librewolf/librewolf/g' '{}')\" >'{}'"

[1] 1c5a673547/pages/docs/faq.md
[2] ecb7338cbe/librewolf.desktop

Fixes: https://github.com/netblue30/firejail/issues/5460
2023-04-11 17:52:04 -03:00
11 changed files with 74 additions and 65 deletions

View file

@ -15,19 +15,20 @@ Images:
matrix: matrix:
- DISTRO: - DISTRO:
- debian11 - debian11
- debian12
- ubuntu20 - ubuntu20
- ubuntu22 - ubuntu22
- mint20 - mint20
- mint21 - mint21
- fedora37 - fedora37
- fedora36 - fedora38
- macos-x86_64
- macos-aarch64
- dind - dind
script: 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 - 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: Build:
stage: build stage: build
@ -37,14 +38,13 @@ Build:
matrix: matrix:
- DISTRO: - DISTRO:
- debian11 - debian11
- debian12
- ubuntu20 - ubuntu20
- ubuntu22 - ubuntu22
- mint20 - mint20
- mint21 - mint21
- fedora37 - fedora37
- fedora36 - fedora38
- macos-x86_64
- macos-aarch64
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
tags: tags:
- autoscale - autoscale
@ -55,15 +55,13 @@ Build:
- echo VERSION=$(cat version) >> variables.env - echo VERSION=$(cat version) >> variables.env
- echo RELEASE=$(cat release) >> variables.env - echo RELEASE=$(cat release) >> variables.env
- echo SOURCE_RELEASE=$(cat source_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: artifacts:
paths: paths:
- librewolf-*.deb - librewolf-*.deb
- librewolf-*.deb.sha256sum - librewolf-*.deb.sha256sum
- librewolf-*.rpm - librewolf-*.rpm
- librewolf-*.rpm.sha256sum - librewolf-*.rpm.sha256sum
- librewolf-*.dmg
- librewolf-*.dmg.sha256sum
- librewolf-*-setup.exe - librewolf-*-setup.exe
- librewolf-*-setup.exe.sha256sum - librewolf-*-setup.exe.sha256sum
- librewolf-*-portable.zip - librewolf-*-portable.zip
@ -86,7 +84,8 @@ Release:
before_script: before_script:
- apt-get update - apt-get update
- apt-get install -y curl - 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 - chmod +x /usr/local/bin/release-cli
script: 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
upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum 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
upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb 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.en-US.mint21.x86_64.deb.sha256sum
upload_package librewolf-$FILEVER.fc37.x86_64.rpm upload_package librewolf-$FILEVER.fc37.x86_64.rpm
upload_package librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum upload_package librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum
upload_package librewolf-$FILEVER.fc36.x86_64.rpm upload_package librewolf-$FILEVER.fc38.x86_64.rpm
upload_package librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum upload_package librewolf-$FILEVER.fc38.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
echo "Creating Codeberg release" echo "Creating Codeberg release"
codeberg_release_body="${codeberg_release_body}\n[View on GitLab](https://gitlab.com/librewolf-community/browser/bsys5/-/releases/$FILEVER)" 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", "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
"distros": ["bullseye"] "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", "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
"distros": ["focal"] "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.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)" echo "Submitted update request to LibreWolf Software Repository (https://updaterepos.librewolf.net/job?id=$id)"
release: release:
tag_name: "$FILEVER" 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: assets:
links: links:
- name: Debian 11 (deb) - name: Debian 11 (deb)
@ -183,6 +187,12 @@ Release:
- name: Debian 11 (sha256sum) - name: Debian 11 (sha256sum)
link_type: other 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 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) - name: Ubuntu 20 (deb)
link_type: package link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb 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) - name: Fedora 37 (sha256sum)
link_type: other link_type: other
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc37.x86_64.rpm.sha256sum 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 link_type: package
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.x86_64.rpm
- name: Fedora 36 (sha256sum) - name: Fedora 38 (sha256sum)
link_type: other link_type: other
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc38.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

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

View file

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

View file

@ -14,7 +14,7 @@ ENV TZ=Europe/Amsterdam
# dependencies needed to run ./mach bootstrap # 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 ( 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) RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ; true)

View file

@ -20,7 +20,7 @@ librewolf-$(full_version).en-US.$(distro).x86_64.deb : $(infile)
(cd work && tar xf ../$<) (cd work && tar xf ../$<)
cp -v assets/linux.build-deb.sh work/ cp -v assets/linux.build-deb.sh work/
[ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true [ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true
(cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > start-librewolf.desktop) (cd work && sed "s/MYDIR/\/usr\/share\/librewolf/g" < ../assets/linux.librewolf.desktop.in > librewolf.desktop)
ifeq ($(use_docker),false) ifeq ($(use_docker),false)
(cd work && bash linux.build-deb.sh $(full_version)) (cd work && bash linux.build-deb.sh $(full_version))
else else
@ -46,7 +46,7 @@ librewolf-$(full_version).$(fc).x86_64.rpm : $(infile)
cp -v release work cp -v release work
cp -v source_release work cp -v source_release work
cp -v assets/linux.librewolf.spec work/librewolf.spec cp -v assets/linux.librewolf.spec work/librewolf.spec
cp -v assets/linux.librewolf.desktop.in work/librewolf/start-librewolf.desktop.in cp -v assets/linux.librewolf.desktop.in work/librewolf/librewolf.desktop.in
cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico cp -v assets/linux.librewolf.ico work/librewolf/librewolf.ico
[ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true [ "$(SIGNING_KEY)" != "" ] && cp -v $(SIGNING_KEY) work/pk.asc ; true
rm -f work/librewolf/browser/features/proxy-failover@mozilla.com.xpi rm -f work/librewolf/browser/features/proxy-failover@mozilla.com.xpi
@ -66,4 +66,3 @@ endif
artifacts-rpm : $(infile) $(infile).sha256sum artifacts-rpm : $(infile) $(infile).sha256sum
sha256sum -c $(infile).sha256sum sha256sum -c $(infile).sha256sum
${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm ${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(full_version).$(fc).x86_64.rpm

View file

@ -42,13 +42,13 @@ cp -v usr/share/librewolf/browser/chrome/icons/default/default16.png usr/share/i
cp -v usr/share/librewolf/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/librewolf.png cp -v usr/share/librewolf/browser/chrome/icons/default/default32.png usr/share/icons/hicolor/32x32/apps/librewolf.png
cp -v usr/share/librewolf/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/librewolf.png cp -v usr/share/librewolf/browser/chrome/icons/default/default64.png usr/share/icons/hicolor/64x64/apps/librewolf.png
cp -v usr/share/librewolf/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/librewolf.png cp -v usr/share/librewolf/browser/chrome/icons/default/default128.png usr/share/icons/hicolor/128x128/apps/librewolf.png
cp -v ../start-librewolf.desktop usr/share/applications/start-librewolf.desktop cp -v ../librewolf.desktop usr/share/applications/librewolf.desktop
cd .. cd ..
dpkg-deb --build librewolf dpkg-deb --build librewolf
# Sign the deb file if private key is provided # Sign the deb file if private key is provided and we have dpkg-sig available
if [[ -f pk.asc ]]; then if [[ -f pk.asc ]] && command -v dpkg-sig &>/dev/null; then
gpg --import pk.asc gpg --import pk.asc
dpkg-sig --sign builder librewolf.deb dpkg-sig --sign builder librewolf.deb
fi 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/__VERSION__/$version/g" </work/librewolf.spec >/work/tmp.spec
sed "s/__RELEASE__/$full_release/g" </work/tmp.spec >rpmbuild/SPECS/librewolf.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 # copy in the librewolf assets
cp -rv /work/librewolf rpmbuild/SOURCES cp -rv /work/librewolf rpmbuild/SOURCES
@ -67,7 +70,7 @@ cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/defaul
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default32.png librewolf-$version/usr/share/icons/hicolor/32x32/apps/librewolf.png cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default32.png librewolf-$version/usr/share/icons/hicolor/32x32/apps/librewolf.png
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/hicolor/64x64/apps/librewolf.png cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/hicolor/64x64/apps/librewolf.png
cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default128.png librewolf-$version/usr/share/icons/hicolor/128x128/apps/librewolf.png cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default128.png librewolf-$version/usr/share/icons/hicolor/128x128/apps/librewolf.png
sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/start-librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop sed "s/MYDIR/\/usr\/share\/librewolf/g" </work/librewolf/librewolf.desktop.in >librewolf-$version/usr/share/applications/librewolf.desktop
tar cvfz lw.tar.gz librewolf-$version tar cvfz lw.tar.gz librewolf-$version
# todo perhaps: rm -rf librwolf-$version # todo perhaps: rm -rf librwolf-$version

View file

@ -61,6 +61,7 @@ cp -rv * "$RPM_BUILD_ROOT"
/usr/share/librewolf/librewolf /usr/share/librewolf/librewolf
/usr/share/librewolf/librewolf-bin /usr/share/librewolf/librewolf-bin
/usr/share/librewolf/librewolf.cfg /usr/share/librewolf/librewolf.cfg
/usr/share/librewolf/librewolf.desktop.in
/usr/share/librewolf/librewolf.ico /usr/share/librewolf/librewolf.ico
/usr/share/librewolf/libsmime3.so /usr/share/librewolf/libsmime3.so
/usr/share/librewolf/libsoftokn3.so /usr/share/librewolf/libsoftokn3.so
@ -69,5 +70,3 @@ cp -rv * "$RPM_BUILD_ROOT"
/usr/share/librewolf/omni.ja /usr/share/librewolf/omni.ja
/usr/share/librewolf/platform.ini /usr/share/librewolf/platform.ini
/usr/share/librewolf/plugin-container /usr/share/librewolf/plugin-container
/usr/share/librewolf/start-librewolf.desktop.in

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 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 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-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

View file

@ -1 +1 @@
112.0 116.0.2

1
windows Submodule

@ -0,0 +1 @@
Subproject commit b3b007f1710ccfe2c9b6442f5f836a16af8b5acb