Merge branch 'master' into windows

use old commit
enable windows build again
2023-02-16 19:40:32 +01:00 · 2023-02-16 11:41:11 +01:00 · 2023-02-16 11:38:44 +01:00
2 changed files with 2 additions and 2 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -3,7 +3,6 @@ stages:
  - build
  - 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
@ -46,6 +45,7 @@ Build:
          - fedora36
          - macos-x86_64
          - macos-aarch64
+          - windows
  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
  tags:
    - autoscale
--- a/assets/windows.mk
+++ b/assets/windows.mk
@ -25,7 +25,7 @@ build :
 	rm -rf windows
 	git clone https://gitlab.com/librewolf-community/browser/windows.git

-	( cd windows/linux && pwd && ${MAKE} fetch )
+	( cd windows/linux && git checkout bbd755475344cebaa8433c56cf4825344feb9e7b && pwd && ${MAKE} fetch )

 ifeq ($(use_docker),false)
 	( cd windows/linux && ${MAKE} )
Author	SHA1	Message	Date
Malte Jürgens	6ab3f6099d	Merge branch 'master' into windows	2023-02-16 19:40:32 +01:00
Malte Jürgens	493a3eed51	use old commit	2023-02-16 11:41:11 +01:00
Malte Jürgens	391cde8547	enable windows build again	2023-02-16 11:38:44 +01:00