From d387c8b79bb5a6f7d48f6eedf7f87cae2701e150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Sat, 23 Jul 2022 16:37:49 +0200
Subject: [PATCH] update

---
 .gitlab-ci.yml          | 2 --
 assets/linux.mk         | 1 +
 assets/macos.Dockerfile | 1 +
 assets/macos.mozconfig  | 4 ----
 source_release          | 2 +-
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a861736..6a0917e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,6 @@ stages:
 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:
diff --git a/assets/linux.mk b/assets/linux.mk
index 94315e9..c7c73d1 100644
--- a/assets/linux.mk
+++ b/assets/linux.mk
@@ -18,6 +18,7 @@ build : $(outfile) $(outfile).sha256sum
 
 $(outfile) :
 	${MAKE} work
+	ln -sfv ./lw/mozconfig.new.without-bootstrap work/librewolf-$(version)-$(source_release)/mozconfig
 ifeq ($(use_docker),false)
 	(cd work/librewolf-$(version)-$(source_release) && ./mach build && echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null)
 else
diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile
index a463aed..bda4042 100644
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@@ -35,6 +35,7 @@ RUN ./mach artifact toolchain --from-build linux64-libdmg
 RUN ./mach artifact toolchain --from-build linux64-cctools-port
 RUN ./mach artifact toolchain --from-build linux64-hfsplus
 RUN ./mach artifact toolchain --from-build linux64-binutils
+RUN ./mach artifact toolchain --from-build sysroot-wasm32-wasi
 ## RUN ./mach artifact toolchain --from-build linux64-clang-macosx-cross
 RUN /root/.cargo/bin/cargo install cbindgen
 RUN /root/.cargo/bin/rustup target add $arch-apple-darwin
diff --git a/assets/macos.mozconfig b/assets/macos.mozconfig
index e236eaa..180e0d9 100644
--- a/assets/macos.mozconfig
+++ b/assets/macos.mozconfig
@@ -55,7 +55,3 @@ mk_add_options MOZ_CRASHREPORTER=0
 mk_add_options MOZ_DATA_REPORTING=0
 mk_add_options MOZ_SERVICES_HEALTHREPORT=0
 mk_add_options MOZ_TELEMETRY_REPORTING=0
-
-# wasi: we ask maintainers to all use this as wasi sysroot..
-# There is a script 'setup-wasi-linux.sh' that attempts to download the wasi sdk and place it into the location pointed to below.
-ac_add_options --with-wasi-sysroot=/root/.mozbuild/wrlb/wasi-sysroot
diff --git a/source_release b/source_release
index 0cfbf08..b8626c4 100644
--- a/source_release
+++ b/source_release
@@ -1 +1 @@
-2
+4