Compare commits

...
Sign in to create a new pull request.

17 commits

Author SHA1 Message Date
Bert van der Weerd
ae0b3fe74e
bump v106.0.1-1 2022-10-21 12:06:37 +02:00
Bert van der Weerd
ea70bfdde6
bump to v106.0-1 2022-10-20 15:01:18 +02:00
Bert van der Weerd
c37e6c7e3b
kick ci 2022-10-09 11:26:33 +02:00
Bert van der Weerd
4cbcd14984
try CI again 2022-10-09 09:20:56 +02:00
Bert van der Weerd
7dddc0924c
bump version v105.0.2 2022-10-05 12:04:05 +02:00
Bert van der Weerd
80d56d35ca
Merge branch 'win64' of gitlab.com:librewolf-community/browser/bsys5 into win64 2022-09-30 10:53:04 +02:00
Bert van der Weerd
d7c6a8c555
added output artifacts 2022-09-30 10:52:52 +02:00
1e041ac430 Fix 2022-09-29 18:56:22 +00:00
c7ace46039 Use custom runners in docker stage 2022-09-29 18:53:31 +00:00
Bert van der Weerd
5b17eafc1f
second try 2022-09-29 00:19:54 +02:00
Bert van der Weerd
8c20e4bbdd
using dind image 2022-09-29 00:16:38 +02:00
Bert van der Weerd
131cefa44a
added only-master to Build 2022-09-29 00:08:26 +02:00
Bert van der Weerd
7fc6291973
added docker-win64 and win64 2022-09-29 00:06:13 +02:00
Bert van der Weerd
93ce41979c
the same error with ubuntu22 as with fedora36 2022-09-27 11:02:36 +02:00
Bert van der Weerd
b81438d786
stuff all the make commands in one layer 2022-09-25 22:59:30 +02:00
Bert van der Weerd
c256134378
syntax correct, still getting export stage errors 2022-09-25 22:53:21 +02:00
Bert van der Weerd
f14b836a8f
added docker-win64 and win64 targets 2022-09-25 21:40:49 +02:00
5 changed files with 87 additions and 7 deletions

View file

@ -4,17 +4,15 @@ stages:
- release
- deploy
Build Docker Images:
stage: images
when: manual
only:
- master
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
# Needed because we aren't using our custom runners here
services:
- docker:dind
variables:
DOCKER_HOST: tcp://docker:2375
tags:
- autoscale
parallel:
matrix:
- DISTRO:
@ -37,6 +35,8 @@ Build Docker Images:
Build:
stage: build
when: manual
only:
- master
allow_failure: false
parallel:
matrix:
@ -73,6 +73,36 @@ Build:
reports:
dotenv: variables.env
docker-win64:
stage: images
when: manual
only:
- win64
image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
tags:
- autoscale
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
- make docker-win64
- docker push registry.gitlab.com/librewolf-community/browser/bsys5/win64:latest
win64:
stage: build
when: manual
only:
- win64
image: registry.gitlab.com/librewolf-community/browser/bsys5/win64:latest
tags:
- autoscale
script:
- make win64
artifacts:
paths:
- librewolf-*-setup.exe
- librewolf-*-portable.zip
Release:
stage: release
when: manual

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-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 docker-win64 win64
version:=$(shell cat version)
release:=$(shell cat release)
@ -19,6 +19,7 @@ help :
@echo " [docker-macos-x86_64], [docker-macos-aarch64]"
@echo " [docker-tumbleweed]"
@echo " [docker-dind]"
@echo " [docker-win64]"
@echo ""
@echo "build targets:"
@echo " [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
@ -26,6 +27,7 @@ help :
@echo " [fedora34], [fedora35], [fedora36]"
@echo " [macos-x64_64], [macos-aarch64]"
@echo " [tumbleweed]"
@echo " [win64]"
@echo " [tarball]"
@echo ""
@ -217,6 +219,12 @@ macos-aarch64 :
${MAKE} -f assets/macos.mk arch=aarch64 build
## win64
docker-win64 :
${MAKE} -f assets/windows.mk docker
win64 :
${MAKE} -f assets/windows.mk build
#
# Docker in Docker (for GitLab CI)
#

View file

@ -0,0 +1,9 @@
FROM ubuntu:jammy
#FROM fedora:36
RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git patch
#RUN dnf -y update && dnf -y install make wget git patch
WORKDIR /
RUN git clone https://gitlab.com/librewolf-community/browser/windows.git
WORKDIR /windows/linux
RUN make setup-debian && make fetch && make bootstrap && make veryclean
#RUN make setup-fedora && make fetch && make bootstrap && make veryclean

33
assets/windows.mk Normal file
View file

@ -0,0 +1,33 @@
# $(use_docker)
.PHONY : docker build
version:=$(shell cat version)
release:=$(shell cat release)
source_release:=$(shell cat source_release)
full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
setupname=librewolf-$(full_version).en-US.win64-setup.exe
zipname=librewolf-$(full_version).en-US.win64-portable.zip
outfiles=$(setupname) $(zipname)
docker :
docker build -t registry.gitlab.com/librewolf-community/browser/bsys5/win64 - < assets/windows.Dockerfile
build : $(outfiles) $(setupname).sha256sum $(zipname).sha256sum
$(outfiles) :
# docker run --rm registry.gitlab.com/librewolf-community/browser/bsys5/win64 sh -c "cd /windows/linux && git pull && make fetch && make all"
( cd /windows/linux && git pull && make fetch && make clean all )
$(setupname).sha256sum : $(setupname)
sha256sum $< > $@
cat $@
$(zipname).sha256sum : $(zipname)
sha256sum $< > $@
cat $@

View file

@ -1 +1 @@
105.0.1
106.0.1