From d6f27133ea20b741c508e0ed2b41360eed906d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Thu, 16 Feb 2023 11:46:03 +0100
Subject: [PATCH 1/2] fix tarball links

---
 assets/linux.Dockerfile | 2 +-
 assets/macos.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/linux.Dockerfile b/assets/linux.Dockerfile
index 252611b..cbe751e 100644
--- a/assets/linux.Dockerfile
+++ b/assets/linux.Dockerfile
@@ -20,7 +20,7 @@ RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ;
 
 # run the bootstrap
 RUN cd /tmp &&\
-    wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build &&\
+    wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz &&\
     tar xf librewolf-$version-$source_release.source.tar.gz &&\
     cd librewolf-$version-$source_release &&\
     MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\
diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile
index 7bcfc5d..c397fd6 100644
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@@ -24,7 +24,7 @@ RUN mkdir -p /osx-cross/MacOSX-SDKs &&\
     rm -f MacOSX11.3.sdk.tar.xz
 
 # run the bootstrap
-RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build
+RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$version-$source_release/librewolf-$version-$source_release.source.tar.gz
 RUN tar xf librewolf-$version-$source_release.source.tar.gz
 WORKDIR librewolf-$version-$source_release
 RUN echo ac_add_options --target=$arch-apple-darwin > mozconfig

From 7e19bbd5c21eb471eca2025007824f71b7f352f2 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 16 Feb 2023 13:16:28 +0100
Subject: [PATCH 2/2] not building windows-docker files

---
 .gitlab-ci.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18876e9..913eb3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,11 +3,13 @@ stages:
   - build
   - release
 
-Build Docker Images:
+
+# 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
-  only:
-    - master
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags: [autoscale]
   parallel:
@@ -23,7 +25,6 @@ Build Docker 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
@@ -45,8 +46,6 @@ Build:
           - fedora36
           - macos-x86_64
           - macos-aarch64
-          # Currently broken :(
-          # - windows
   image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
   tags:
     - autoscale