librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Fix macos images

See merge request librewolf-community/browser/bsys5!15
This commit is contained in:
stanzabird 2023-02-16 16:20:24 +00:00
commit 9dc9e4ecd2
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

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

2
assets/macos.Dockerfile
View file

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

2
assets/macos.mozconfig
View file

@ -22,7 +22,7 @@ export HOST_CC="$CROSS/clang/bin/clang"
export HOST_CXX="$CROSS/clang/bin/clang++" export HOST_CXX="$CROSS/clang/bin/clang++"
# These are needed for packaging. # 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 DMG_TOOL="$CROSS/dmg/dmg"
export HFS_TOOL="$CROSS/dmg/hfsplus" export HFS_TOOL="$CROSS/dmg/hfsplus"