fix

fix tumbleweed error
fix macos dockerfile
2022-07-23 20:42:33 +02:00 · 2022-07-23 20:29:46 +02:00 · 2022-07-23 17:28:45 +02:00 · 2022-07-23 16:41:56 +02:00 · 2022-07-23 16:37:49 +02:00 · 2022-07-23 14:46:01 +02:00
7 changed files with 35 additions and 54 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -7,8 +7,6 @@ stages:
 Build Docker Images:
  stage: images
  when: manual
-  only:
-    - master
  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
  # Needed because we aren't using our custom runners here
  services:
@ -22,7 +20,6 @@ Build Docker Images:
          - ubuntu20
          - ubuntu22
          - mint20
-          - mint21
          - fedora35
          - fedora36
          - tumbleweed
@ -45,12 +42,13 @@ Build:
          - ubuntu20
          - ubuntu22
          - mint20
-          - mint21
          - fedora35
          - fedora36
          - tumbleweed
          - macos-x86_64
          - macos-aarch64
+  variables:
+    SOURCE_URL: $SOURCE_URL
  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
  tags:
    - autoscale
@ -106,8 +104,6 @@ Release:
      upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb.sha256sum
      upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb
      upload_package librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
-      upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb
-      upload_package librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
      upload_package librewolf-$FILEVER.fc35.x86_64.rpm
      upload_package librewolf-$FILEVER.fc35.x86_64.rpm.sha256sum
      upload_package librewolf-$FILEVER.fc36.x86_64.rpm
@ -147,12 +143,6 @@ Release:
        - name: Linux Mint 20 (sha256sum)
          link_type: other
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb.sha256sum
-        - name: Linux Mint 21 (deb)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb
-        - name: Linux Mint 21 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb.sha256sum
        - name: Fedora 35 (rpm)
          link_type: package
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm
@ -219,10 +209,6 @@ Update Repositories:
          {
            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint20.x86_64.deb",
            "distros": ["uma", "una"]
-          },
-          {
-            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mint21.x86_64.deb",
-            "distros": ["vanessa"]
          }
        ],
        "rpms": [
--- a/44
+++ b/44
@ -1,4 +1,4 @@
-.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-mint21 mint21 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind
+.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-ubuntu22 ubuntu22 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-fedora36 fedora36 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64 docker-tumbleweed tumbleweed tarball docker-dind

 version:=$(shell cat version)
 release:=$(shell cat release)
@ -13,18 +13,30 @@ help :
 	@echo "          [update] [prune]         - misc."
 	@echo ""
 	@echo "docker targets:" 
-	@echo "  [docker-debian11], [docker-mint20], [docker-mint21]"
-	@echo "  [docker-ubuntu20], [docker-ubuntu21], [docker-ubuntu22]"
-	@echo "  [docker-fedora34], [docker-fedora35], [docker-fedora36]"
-	@echo "  [docker-macos-x86_64], [docker-macos-aarch64]"
+	@echo "  [docker-debian11]"
+	@echo "  [docker-mint20]"
+	@echo "  [docker-ubuntu20]"
+	@echo "  [docker-ubuntu21]"
+	@echo "  [docker-ubuntu22]"
+	@echo "  [docker-fedora34]"
+	@echo "  [docker-fedora35]"
+	@echo "  [docker-fedora36]"
+	@echo "  [docker-macos-x86_64]"
+	@echo "  [docker-macos-aarch64]"
 	@echo "  [docker-tumbleweed]"
 	@echo "  [docker-dind]"
 	@echo ""
 	@echo "build targets:" 
-	@echo "  [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
+	@echo "  [debian11]"
+	@echo "  [mint20]"
+	@echo "  [ubuntu20]"
+	@echo "  [ubuntu21]"
 	@echo "  [ubuntu22]"
-	@echo "  [fedora34], [fedora35], [fedora36]"
-	@echo "  [macos-x64_64], [macos-aarch64]"
+	@echo "  [fedora34]"
+	@echo "  [fedora35]"
+	@echo "  [fedora36]"
+	@echo "  [macos-x64_64]"
+	@echo "  [macos-aarch64]"
 	@echo "  [tumbleweed]"
 	@echo "  [tarball]"
 	@echo ""
@ -42,7 +54,7 @@ veryclean : clean
 prune :
 	docker system prune --all --force

-docker : docker-debian11 docker-mint20 docker-mint21 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind
+docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-fedora36 docker-tumbleweed docker-macos-x86_64 docker-macos-aarch64 docker-dind

 build :
 	${MAKE} clean
@ -50,8 +62,6 @@ build :
 	${MAKE} clean
 	${MAKE} mint20
 	${MAKE} clean
-	${MAKE} mint21
-	${MAKE} clean
 	${MAKE} ubuntu20
 	${MAKE} clean
 	${MAKE} ubuntu21
@ -74,7 +84,6 @@ build :
 push :
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/debian11
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint20
-	docker push registry.gitlab.com/librewolf-community/browser/bsys5/mint21
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
@ -89,7 +98,6 @@ push :
 rmi :
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/debian11
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint20
-	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/mint21
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu20
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu21
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/ubuntu22
@ -114,13 +122,9 @@ update :
 ## setting up the work folder
 tarball=librewolf-$(version)-$(source_release).source.tar.gz
 $(tarball) :
-ifeq ($(SOURCE_URL),)
 	wget -q -O $(tarball) "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$(version)-$(source_release)/$(tarball)"
 	wget -q -O $(tarball).sha256sum "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/$(version)-$(source_release)/$(tarball).sha256sum"
 	sha256sum -c $(tarball).sha256sum
-else
-	wget -q -O $(tarball) "$(SOURCE_URL)"
-endif
 work : $(tarball)
 	mkdir work
 	(cd work && tar xf ../$(tarball))
@ -144,12 +148,6 @@ docker-mint20 :
 mint20 :
 	${MAKE} -f assets/linux.mk distro=mint20 build
 	${MAKE} -f assets/linux.artifacts.mk distro=mint20 artifacts-deb
-## mint21
-docker-mint21 :
-	${MAKE} -f assets/linux.mk distro=mint21 "distro_image=linuxmintd/mint21-amd64" docker
-mint21 :
-	${MAKE} -f assets/linux.mk distro=mint21 build
-	${MAKE} -f assets/linux.artifacts.mk distro=mint21 artifacts-deb
 ## ubuntu20
 docker-ubuntu20 :
 	${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:focal" docker
--- a/README.md
+++ b/README.md
@ -9,16 +9,15 @@ scripts.

 ## <a id="targets"></a> Supported Targets

-| Platform          | x86_64                  | aarch64            |
-| ----------------- | ----------------------- | ------------------ |
-| Linux             |                         |                    |
-| └─ Debian (deb)   | ✅ (debian11)           | -                  |
-| └─ Ubuntu (deb)   | ✅ (ubuntu20, ubuntu22) | -                  |
-| └─ Mint (deb)     | ✅ (mint20, mint21)     | -                  |
-| └─ Fedora (rpm)   | ✅ (fedora35, fedora36) | -                  |
-| └─ openSUSE (rpm) | ✅ (tumbleweed)         | -                  |
-| MacOS (dmg)       | ✅ (macos-x64_64)       | ✅ (macos-aarch64) |
-| Windows           | _WIP_                   | -                  |
+| Platform        | x86_64                            | aarch64            |
+| --------------- | --------------------------------- | ------------------ |
+| Linux           |                                   |                    |
+| └─ Debian (deb) | ✅ (debian11)                     | -                  |
+| └─ Ubuntu (deb) | ✅ (ubuntu20, ubuntu21, ubuntu22) | -                  |
+| └─ Mint (deb)   | ✅ (mint20)                       | -                  |
+| └─ Fedora (rpm) | ✅ (fedora35, fedora36)           | -                  |
+| MacOS (dmg)     | ✅ (macos-x64_64)                 | ✅ (macos-aarch64) |
+| Windows         | _WIP_                             | -                  |

 ## Running bsys5 Locally

--- a/assets/linux.librewolf.spec
+++ b/assets/linux.librewolf.spec
@ -6,7 +6,6 @@ Summary:        The LibreWolf browser
 License:        MPL
 URL:            https://librewolf-community.gitlab.io/
 Source0:        lw.tar.gz
-Distribution:   %(source /etc/os-release && echo $PRETTY_NAME)
 #BuildRequires:  
 #Requires:       
 %description
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@ -35,13 +35,12 @@ RUN ./mach artifact toolchain --from-build linux64-libdmg
 RUN ./mach artifact toolchain --from-build linux64-cctools-port
 RUN ./mach artifact toolchain --from-build linux64-hfsplus
 RUN ./mach artifact toolchain --from-build linux64-binutils
-RUN ./mach artifact toolchain --from-build sysroot-wasm32-wasi
+RUN dir="$PWD" && cd /root/.mozbuild && "$dir/mach" artifact toolchain --from-build sysroot-wasm32-wasi
 ## RUN ./mach artifact toolchain --from-build linux64-clang-macosx-cross
 RUN /root/.cargo/bin/cargo install cbindgen
 RUN /root/.cargo/bin/rustup target add $arch-apple-darwin
 RUN cp -r binutils /root/.mozbuild
 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
--- a/2
+++ b/2
@ -1 +1 @@
-1
+4
--- a/2
+++ b/2
@ -1 +1 @@
-103.0.2
+102.0.1
Author	SHA1	Message	Date
Malte Jürgens	084df7f986	fix	2022-07-23 20:42:33 +02:00
Malte Jürgens	0e6aef968e	fix tumbleweed error	2022-07-23 20:29:46 +02:00
Malte Jürgens	0f68c8961c	fix macos dockerfile	2022-07-23 17:28:45 +02:00
Malte Jürgens	205459e286	drop ubuntu21 from ci	2022-07-23 16:41:56 +02:00
Malte Jürgens	d387c8b79b	update	2022-07-23 16:37:49 +02:00
Malte Jürgens	7ab15d3bad	fix	2022-07-23 14:46:01 +02:00
Malte Jürgens	aa9de3df4e	add libzip2	2022-07-23 13:59:37 +02:00
Malte Jürgens	55d253883b	Revert "change release" This reverts commit `2984fad8f0`.	2022-07-23 13:49:56 +02:00
Malte Jürgens	2984fad8f0	change release	2022-07-23 13:49:16 +02:00
Malte Jürgens	fe287c7789	remove `--enable-bootstrap`	2022-07-23 13:46:07 +02:00
Malte Jürgens	572f2726b4	remove dind service	2022-07-23 13:14:59 +02:00
Malte Jürgens	36b53d8dc8	remove DOCKER_HOST	2022-07-23 13:10:03 +02:00
Malte Jürgens	0d88305c2d	add dind service	2022-07-23 13:02:03 +02:00
Malte Jürgens	3f0d8a4ee9	also install wget	2022-07-23 12:56:23 +02:00
Malte Jürgens	d2f564faef	test dind	2022-07-23 12:53:43 +02:00
 @ -1 +1 @@
 .0.2
 .0.1