Compare commits
17 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae0b3fe74e | ||
|
|
ea70bfdde6 | ||
|
|
c37e6c7e3b | ||
|
|
4cbcd14984 | ||
|
|
7dddc0924c | ||
|
|
80d56d35ca | ||
|
|
d7c6a8c555 | ||
| 1e041ac430 | |||
| c7ace46039 | |||
|
|
5b17eafc1f | ||
|
|
8c20e4bbdd | ||
|
|
131cefa44a | ||
|
|
7fc6291973 | ||
|
|
93ce41979c | ||
|
|
b81438d786 | ||
|
|
c256134378 | ||
|
|
f14b836a8f |
5 changed files with 87 additions and 7 deletions
|
|
@ -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
|
||||
|
|
|
|||
10
Makefile
10
Makefile
|
|
@ -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)
|
||||
#
|
||||
|
|
|
|||
9
assets/windows.Dockerfile
Normal file
9
assets/windows.Dockerfile
Normal 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
33
assets/windows.mk
Normal 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 $@
|
||||
2
version
2
version
|
|
@ -1 +1 @@
|
|||
105.0.1
|
||||
106.0.1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue