fix merge conflicts

.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,7 @@ Build Docker Images:
           - macos-x86_64
           - macos-aarch64
           - dind
-          - windows
+	  - windows
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
     - make docker-$DISTRO

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 &&\

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