add `tumbleweed` target
This commit is contained in:
Malte Jürgens
parent
d4f4559435
commit
6d166386d4
|
|
@ -22,6 +22,7 @@ Build Docker Images:
|
|||
- mint20
|
||||
- fedora35
|
||||
- fedora36
|
||||
- tumbleweed
|
||||
- macos-x86_64
|
||||
- macos-aarch64
|
||||
variables:
|
||||
|
|
@ -54,6 +55,7 @@ Build:
|
|||
- mint20
|
||||
- fedora35
|
||||
- fedora36
|
||||
- tumbleweed
|
||||
- macos-x86_64
|
||||
- macos-aarch64
|
||||
variables:
|
||||
|
|
@ -120,6 +122,8 @@ Release:
|
|||
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.sha256sum
|
||||
upload_package librewolf-$FILEVER.tumbleweed.x86_64.rpm
|
||||
upload_package librewolf-$FILEVER.tumbleweed.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
|
||||
|
|
@ -171,6 +175,12 @@ Release:
|
|||
- name: Fedora 36 (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: openSUSE Tumbleweed (rpm)
|
||||
link_type: package
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.tumbleweed.x86_64.rpm
|
||||
- name: openSUSE Tumbleweed (sha256sum)
|
||||
link_type: other
|
||||
url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.tumbleweed.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
|
||||
|
|
@ -231,6 +241,9 @@ Update Repositories:
|
|||
},
|
||||
{
|
||||
"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.tumbleweed.x86_64.rpm"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
11
Makefile
11
Makefile
|
|
@ -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 tarball
|
||||
.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
|
||||
|
||||
version:=$(shell cat version)
|
||||
release:=$(shell cat release)
|
||||
|
|
@ -23,6 +23,7 @@ help :
|
|||
@echo " [docker-fedora36]"
|
||||
@echo " [docker-macos-x86_64]"
|
||||
@echo " [docker-macos-aarch64]"
|
||||
@echo " [docker-tumbleweed]"
|
||||
@echo ""
|
||||
@echo "build targets:"
|
||||
@echo " [debian11]"
|
||||
|
|
@ -35,6 +36,7 @@ help :
|
|||
@echo " [fedora36]"
|
||||
@echo " [macos-x64_64]"
|
||||
@echo " [macos-aarch64]"
|
||||
@echo " [tumbleweed]"
|
||||
@echo " [tarball]"
|
||||
@echo ""
|
||||
|
||||
|
|
@ -119,6 +121,7 @@ $(tarball) :
|
|||
work : $(tarball)
|
||||
mkdir work
|
||||
(cd work && tar xf ../$(tarball))
|
||||
echo ac_add_options --enable-bootstrap >> work/librewolf-$(version)-$(source_release)/mozconfig
|
||||
|
||||
|
||||
|
||||
|
|
@ -175,6 +178,12 @@ docker-fedora36 :
|
|||
fedora36 :
|
||||
${MAKE} -f assets/linux.mk distro=fedora36 build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=fc36 distro=fedora36 artifacts-rpm
|
||||
## opensuse tumbleweed
|
||||
docker-tumbleweed :
|
||||
${MAKE} -f assets/linux.mk distro=tumbleweed "distro_image=opensuse/tumbleweed" docker
|
||||
tumbleweed :
|
||||
${MAKE} -f assets/linux.mk distro=tumbleweed build
|
||||
${MAKE} -f assets/linux.artifacts.mk fc=tumbleweed distro=tumbleweed artifacts-rpm
|
||||
|
||||
## tarball
|
||||
tarball :
|
||||
|
|
|
|||
|
|
@ -14,8 +14,9 @@ ENV TZ=Europe/Amsterdam
|
|||
|
||||
|
||||
# dependencies needed to run ./mach bootstrap
|
||||
RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget dpkg-sig ; true)
|
||||
RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget rpm-build rpm-sign ; true)
|
||||
RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true)
|
||||
RUN ( dnf -y upgrade && dnf -y install python3 python3-devel wget rpm-build rpm-sign ; true)
|
||||
RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build lld ; true)
|
||||
|
||||
# setup wasi
|
||||
RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\
|
||||
|
|
@ -27,7 +28,7 @@ RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\
|
|||
rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-*
|
||||
|
||||
# run the bootstrap
|
||||
RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build &&\
|
||||
RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/2753010907/artifacts/raw/librewolf-102.0.1-1.source.tar.gz &&\
|
||||
tar xf librewolf-$version-$source_release.source.tar.gz &&\
|
||||
cd librewolf-$version-$source_release &&\
|
||||
MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ echo '---'
|
|||
|
||||
rm -rf rpmbuild
|
||||
mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
|
||||
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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue