Fri Feb 24 07:29:50 PM CET 2023

- /assets/windows.Dockerfile
- /assets/windows.mk

.gitlab-ci.yml

@@ -4,14 +4,17 @@ stages:
   - release
 
 
-# Notes; we want short labes so we can see what is what, and
-# allow image builds on all branches because don't wan to
-# deal with them on the master branch
 Images:
   stage: images
   when: manual
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags: [autoscale]
+  # checkout our submodules
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+  before_script:
+    - git submodule sync
+    - git submodule update --init --recursive
   parallel:
     matrix:
       - DISTRO:
@@ -25,15 +28,23 @@ Images:
           - macos-x86_64
           - macos-aarch64
           - dind
+          - windows
   script:
     - 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
 
+
 Build:
   stage: build
   when: manual
   allow_failure: false
+  # checkout our submodules
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+  before_script:
+    - git submodule sync
+    - git submodule update --init --recursive
   parallel:
     matrix:
       - DISTRO:
@@ -46,6 +57,7 @@ Build:
           - fedora36
           - macos-x86_64
           - macos-aarch64
+          - windows
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags:
     - autoscale
@@ -69,9 +81,11 @@ Build:
       - librewolf-*-setup.exe.sha256sum
       - librewolf-*-portable.zip
       - librewolf-*-portable.zip.sha256sum
+      - firefox-*.zip
     reports:
       dotenv: variables.env
 
+
 Release:
   stage: release
   when: manual

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-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-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind windows docker-windows windows-submodules-update
 
 version:=$(shell cat version)
 release:=$(shell cat release)
@@ -19,7 +19,7 @@ help :
 	@echo "  [docker-macos-x86_64], [docker-macos-aarch64]"
 	@echo "  [docker-tumbleweed]"
 	@echo "  [docker-dind]"
-	@echo "  [docker-windows]"
+	@echo "  [docker-windows] [windows-submodules-update]"
 	@echo ""
 	@echo "build targets:" 
 	@echo "  [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
@@ -220,6 +220,9 @@ docker-windows :
 windows :
 	${MAKE} -f assets/windows.mk build
 
+windows-submodules-update :
+	git submodule update --recursive --remote
+
 #
 # Docker in Docker (for GitLab CI)
 #

README.md

@@ -35,3 +35,4 @@ repository. Then you can just build the target you want with:
 This will pull a prebuilt build environment from
 [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry).
 If you also want to build that yourself, run `make docker-<TARGET>` first.
+

assets/windows.Dockerfile

@@ -1,8 +0,0 @@
-FROM ubuntu:latest
-RUN apt-get -y update && apt-get -y upgrade && apt-get -y install bash git wget build-essential zip
-RUN dpkg --add-architecture i386 && apt-get -y update && apt-get -y install wine32
-
-RUN tmpdir=$(mktemp -d) && cd $tmpdir && git clone https://gitlab.com/librewolf-community/browser/windows.git && cd windows/linux && make setup-debian && make fetch && make bootstrap && cd /root && rm -rf $tmpdir
-
-WORKDIR /work
-VOLUME ["/work"]

assets/windows.mk

@@ -17,23 +17,17 @@ image=registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest
 
 docker :
 
-	docker build -t $(image) - < assets/windows.Dockerfile
+	docker build -t $(image) - < submodules/windows/linux/assets/Dockerfile
 
+build_commands=upstream-update fetch-archive extract-arch patch-folder-arch build-arch buildsymbols-arch package-arch grab-build-artifact-arch
 build :
-
-	pwd
-	rm -rf windows
-	git clone https://gitlab.com/librewolf-community/browser/windows.git
-
-	( cd windows/linux && pwd && ${MAKE} fetch )
-
 ifeq ($(use_docker),false)
-	( cd windows/linux && ${MAKE} )
+	( cd submodules/windows/linux && ${MAKE} $(build_commands) )
 else
-	docker run --rm -v $(shell pwd)/windows/linux:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "${MAKE} all"
+	docker run --rm -v $(shell pwd)/submodules/windows/linux:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "git pull && ${MAKE} $(build_commands)"
 endif
 
-	cp -v windows/linux/$(outfiles) .
+	cp -v submodules/windows/linux/$(outfiles) .
 
 	sha256sum $(outfile-exe) > $(outfile-exe).sha256sum
 	cat $(outfile-exe).sha256sum

submodules/windows

@@ -1 +1 @@
-Subproject commit 33821c61665f96aaec2847c740c7e322b629d7da
+Subproject commit 70b155aca44a159c3a93430f283efd2df2381547