From 71c6415b806ed66502351c9dbfd0c285ccbb76cd Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Feb 2023 11:44:00 +0100 Subject: [PATCH 01/11] Thu Feb 16 11:44:00 AM CET 2023 --- windows | 1 - 1 file changed, 1 deletion(-) delete mode 160000 windows diff --git a/windows b/windows deleted file mode 160000 index 5111065..0000000 --- a/windows +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 51110653120b2c84ee9412d21f8e8c3744f70b12 From 68d4756d6c5eabf8ec4c60154fcb4c259044dfc0 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Feb 2023 11:46:08 +0100 Subject: [PATCH 02/11] added submodules/windows --- .gitmodules | 3 +++ submodules/windows | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 submodules/windows diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..04d6895 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "submodules/windows"] + path = submodules/windows + url = https://gitlab.com/librewolf-community/browser/windows.git diff --git a/submodules/windows b/submodules/windows new file mode 160000 index 0000000..33821c6 --- /dev/null +++ b/submodules/windows @@ -0,0 +1 @@ +Subproject commit 33821c61665f96aaec2847c740c7e322b629d7da From d6f27133ea20b741c508e0ed2b41360eed906d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Thu, 16 Feb 2023 11:46:03 +0100 Subject: [PATCH 03/11] 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 Date: Thu, 16 Feb 2023 13:16:28 +0100 Subject: [PATCH 04/11] 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 From 0090a46403177f5b48a851d7de3554172484b2fb Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Feb 2023 13:43:54 +0100 Subject: [PATCH 05/11] Thu Feb 16 01:43:54 PM CET 2023 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 913eb3a..a701888 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,8 @@ Images: - mint21 - fedora37 - fedora36 - - macos-x86_64 - - macos-aarch64 +# - macos-x86_64 +# - macos-aarch64 - dind script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com From 0a0042c4b58bb2340ab9199a148ec2edfe0e3792 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Feb 2023 13:48:26 +0100 Subject: [PATCH 06/11] Thu Feb 16 01:48:26 PM CET 2023 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a701888..913eb3a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,8 @@ Images: - mint21 - fedora37 - fedora36 -# - macos-x86_64 -# - macos-aarch64 + - macos-x86_64 + - macos-aarch64 - dind script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com From d2bc4521672b5cb4d07da1d7b4284730cb39d4a5 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Feb 2023 13:49:34 +0100 Subject: [PATCH 07/11] Thu Feb 16 01:49:34 PM CET 2023 --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a701888..d26e3a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,6 @@ Images: - mint21 - fedora37 - fedora36 -# - macos-x86_64 -# - macos-aarch64 - dind script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com From 85949fec35752e780b36a8d21d7e4ab481bef975 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Feb 2023 14:06:01 +0100 Subject: [PATCH 08/11] Thu Feb 16 02:06:01 PM CET 2023 --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d26e3a5..ec7e117 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,8 +42,6 @@ Build: - mint21 - fedora37 - fedora36 - - macos-x86_64 - - macos-aarch64 image: registry.gitlab.com/librewolf-community/browser/bsys5/dind tags: - autoscale From dff787bde5dbc1af798de8a902104b6929c0aa22 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Feb 2023 14:07:36 +0100 Subject: [PATCH 09/11] Thu Feb 16 02:07:36 PM CET 2023 --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec7e117..d26e3a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,8 @@ Build: - mint21 - fedora37 - fedora36 + - macos-x86_64 + - macos-aarch64 image: registry.gitlab.com/librewolf-community/browser/bsys5/dind tags: - autoscale From 5aa415ad6aa99f795799a8c994c71464ff93005c Mon Sep 17 00:00:00 2001 From: stanzabird Date: Thu, 16 Feb 2023 13:17:59 +0000 Subject: [PATCH 10/11] let's just try this for now --- assets/macos.Dockerfile | 2 +- assets/macos.mozconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile index c397fd6..6fe3750 100644 --- a/assets/macos.Dockerfile +++ b/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 diff --git a/assets/macos.mozconfig b/assets/macos.mozconfig index 180e0d9..4fef1be 100644 --- a/assets/macos.mozconfig +++ b/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" From d28ed6123fbd8a1f63033066f46433dad67741e2 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 16 Feb 2023 17:19:07 +0100 Subject: [PATCH 11/11] Thu Feb 16 05:19:07 PM CET 2023 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a3c7211..95fdb55 100644 --- a/README.md +++ b/README.md @@ -35,3 +35,4 @@ repository. Then you can just build the target you want with: This will pull a prebuilt build environment from [this repository](https://gitlab.com/librewolf-community/browser/bsys5/container_registry). If you also want to build that yourself, run `make docker-` first. +