Merge branch 'fix-macos-images' into 'master'

Fix macos images

See merge request librewolf-community/browser/bsys5!15

.gitlab-ci.yml

@@ -22,6 +22,8 @@ Images:
           - mint21
           - fedora37
           - fedora36
+          - macos-x86_64
+          - macos-aarch64
           - dind
   script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com

assets/macos.Dockerfile

@@ -44,7 +44,7 @@ RUN cp -r cctools /root/.mozbuild
 RUN cp -r sysroot-wasm32-wasi /root/.mozbuild
 ## RUN cp -r clang /root/.mozbuild
 RUN cp -r dmg /root/.mozbuild
-RUN cp -r hfsplus-tools /root/.mozbuild
+# RUN cp -r hfsplus-tools /root/.mozbuild
 RUN pip install testresources pycairo
 WORKDIR ..
 RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz

assets/macos.mozconfig

@@ -22,7 +22,7 @@ export HOST_CC="$CROSS/clang/bin/clang"
 export HOST_CXX="$CROSS/clang/bin/clang++"
 
 # These are needed for packaging.
-export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
+# export MKFSHFS="$CROSS/hfsplus-tools/newfs_hfs"
 export DMG_TOOL="$CROSS/dmg/dmg"
 export HFS_TOOL="$CROSS/dmg/hfsplus"