made help message more compact

update to 103.0.2-1
add mint21 target
2022-08-13 11:48:48 +02:00 · 2022-08-09 23:41:16 +02:00 · 2022-08-07 21:19:44 +02:00 · 2022-08-05 13:19:09 +02:00 · 2022-08-05 13:19:01 +02:00 · 2022-07-29 14:24:42 +02:00
12 changed files with 190 additions and 83 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -9,32 +9,26 @@ Build Docker Images:
  when: manual
  only:
    - master
-  image: ubuntu
+  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
+  # Needed because we aren't using our custom runners here
  services:
    - docker:dind
+  variables:
+    DOCKER_HOST: tcp://docker:2375
  parallel:
    matrix:
      - DISTRO:
          - debian11
          - ubuntu20
-          - ubuntu21
          - ubuntu22
          - mint20
+          - mint21
          - fedora35
          - fedora36
+          - tumbleweed
          - macos-x86_64
          - macos-aarch64
-  variables:
-    DOCKER_HOST: tcp://docker:2375
-  # Install docker and make
-  before_script:
-    - apt-get update
-    - apt-get install -y ca-certificates curl gnupg lsb-release
-    - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-    - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-    - apt-get update
-    - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin make
-  # Build container
+          - dind
  script:
    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
    - make docker-$DISTRO
@ -49,17 +43,15 @@ Build:
      - DISTRO:
          - debian11
          - ubuntu20
-          - ubuntu21
          - ubuntu22
          - mint20
+          - mint21
          - fedora35
          - fedora36
+          - tumbleweed
          - macos-x86_64
          - macos-aarch64
-  variables:
-    SOURCE_URL: $SOURCE_URL
-    use_docker: "false"
-  image: registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO
+  image: registry.gitlab.com/librewolf-community/browser/bsys5/dind
  tags:
    - autoscale
  except:
@ -110,16 +102,18 @@ Release:
      upload_package librewolf-$FILEVER.en-US.debian11.x86_64.deb.sha256sum
      upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb
      upload_package librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
-      upload_package librewolf-$FILEVER.en-US.ubuntu21.x86_64.deb
-      upload_package librewolf-$FILEVER.en-US.ubuntu21.x86_64.deb.sha256sum
      upload_package librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb
      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
      upload_package librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
+      upload_package librewolf-$FILEVER.tumbleweed.x86_64.rpm
+      upload_package librewolf-$FILEVER.tumbleweed.x86_64.rpm.sha256sum
      upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg
      upload_package librewolf-$FILEVER.en-US.mac.x86_64.dmg.sha256sum
      upload_package librewolf-$FILEVER.en-US.mac.aarch64.dmg
@ -141,12 +135,6 @@ Release:
        - name: Ubuntu 20 (sha256sum)
          link_type: other
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb.sha256sum
-        - name: Ubuntu 21 (deb)
-          link_type: package
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu21.x86_64.deb
-        - name: Ubuntu 21 (sha256sum)
-          link_type: other
-          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu21.x86_64.deb.sha256sum
        - name: Ubuntu 22 (deb)
          link_type: package
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb
@ -159,6 +147,12 @@ 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
@ -171,6 +165,12 @@ Release:
        - name: Fedora 36 (sha256sum)
          link_type: other
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm.sha256sum
+        - name: openSUSE Tumbleweed (rpm)
+          link_type: package
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.tumbleweed.x86_64.rpm
+        - name: openSUSE Tumbleweed (sha256sum)
+          link_type: other
+          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.tumbleweed.x86_64.rpm.sha256sum
        - name: macOS x86_64 (dmg)
          link_type: package
          url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.mac.x86_64.dmg
@ -186,17 +186,60 @@ Release:

 Update Repositories:
  stage: deploy
-  needs:
-    - job: "Build"
-      artifacts: true
-    - job: "Release"
  only:
    - master
  except:
    - merge_requests
-  image: ubuntu
-  before_script:
-    - apt-get update
-    - apt-get install -y curl
+  image: curlimages/curl
  script:
-    - curl "https://shorsh.de/update_lw_repos.php?version=$FILEVER&log=true&token=$REPO_DEPLOY_TOKEN"
+    - |
+      #
+      FILEVER=$(cat version)-$(cat source_release) ; grep -q 1 release ; if [ ! $? ]; then FILEVER=$(cat version)-$(cat source_release)-$(cat release); fi
+
+      curl "https://shorsh.de/update_lw_repos.php?version=$FILEVER&log=false&token=$REPO_DEPLOY_TOKEN"
+
+      echo "Submitted update request to live LibreWolf repositories"
+
+      body=$(cat <<EOF
+      {
+        "token": "$REPO_DEPLOY_TOKEN",
+        "debs": [
+          {
+            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.debian11.x86_64.deb",
+            "distros": ["bullseye"]
+          },
+          {
+            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu20.x86_64.deb",
+            "distros": ["focal"]
+          },
+          {
+            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.en-US.ubuntu22.x86_64.deb",
+            "distros": ["jammy"]
+          },
+          {
+            "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": [
+          {
+            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc35.x86_64.rpm"
+          },
+          {
+            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.fc36.x86_64.rpm"
+          },
+          {
+            "file": "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$FILEVER/librewolf-$FILEVER.tumbleweed.x86_64.rpm"
+          }
+        ]
+      }
+      EOF
+      )
+
+      id=$(curl "https://kho.librewolf.net/job" --request POST --data "$body")
+
+      echo "Submitted update request to testing LibreWolf repository (https://kho.librewolf.net/job?id=$id)"
--- a/74
+++ b/74
@ -1,4 +1,4 @@
-.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
+.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

 version:=$(shell cat version)
 release:=$(shell cat release)
@ -13,28 +13,20 @@ help :
 	@echo "          [update] [prune]         - misc."
 	@echo ""
 	@echo "docker targets:" 
-	@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-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-tumbleweed]"
+	@echo "  [docker-dind]"
 	@echo ""
 	@echo "build targets:" 
-	@echo "  [debian11]"
-	@echo "  [mint20]"
-	@echo "  [ubuntu20]"
-	@echo "  [ubuntu21]"
+	@echo "  [debian11], [mint20], [mint21], [ubuntu20], [ubuntu21]"
 	@echo "  [ubuntu22]"
-	@echo "  [fedora34]"
-	@echo "  [fedora35]"
-	@echo "  [fedora36]"
-	@echo "  [macos-x64_64]"
-	@echo "  [macos-aarch64]"
+	@echo "  [fedora34], [fedora35], [fedora36]"
+	@echo "  [macos-x64_64], [macos-aarch64]"
+	@echo "  [tumbleweed]"
+	@echo "  [tarball]"
 	@echo ""


@ -50,7 +42,7 @@ veryclean : clean
 prune :
 	docker system prune --all --force

-docker : docker-debian11 docker-mint20 docker-ubuntu20 docker-ubuntu21 docker-ubuntu22 docker-fedora34 docker-fedora35 docker-fedora36 docker-macos-x86_64 docker-macos-aarch64
+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

 build :
 	${MAKE} clean
@ -58,6 +50,8 @@ build :
 	${MAKE} clean
 	${MAKE} mint20
 	${MAKE} clean
+	${MAKE} mint21
+	${MAKE} clean
 	${MAKE} ubuntu20
 	${MAKE} clean
 	${MAKE} ubuntu21
@ -70,6 +64,8 @@ build :
 	${MAKE} clean
 	${MAKE} fedora36
 	${MAKE} clean
+	${MAKE} tumbleweed
+	${MAKE} clean
 	${MAKE} macos-x86_64
 	${MAKE} clean
 	${MAKE} macos-aarch64
@ -78,26 +74,32 @@ 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
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora35
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
 	docker push registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
+	docker push registry.gitlab.com/librewolf-community/browser/bsys5/dind

 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
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora34
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora35
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/fedora36
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/tumbleweed
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-x86_64
 	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/macos-aarch64
+	docker rmi registry.gitlab.com/librewolf-community/browser/bsys5/dind

 update :
 	@wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version"
@ -112,9 +114,13 @@ 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))
@ -138,6 +144,12 @@ 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
@ -174,7 +186,19 @@ docker-fedora36 :
 fedora36 :
 	${MAKE} -f assets/linux.mk distro=fedora36 build
 	${MAKE} -f assets/linux.artifacts.mk fc=fc36 distro=fedora36 artifacts-rpm
+## opensuse tumbleweed
+docker-tumbleweed :
+	${MAKE} -f assets/linux.mk distro=tumbleweed "distro_image=opensuse/tumbleweed" docker
+tumbleweed :
+	${MAKE} -f assets/linux.mk distro=tumbleweed build
+	${MAKE} -f assets/linux.artifacts.mk fc=tumbleweed distro=tumbleweed artifacts-rpm

+## tarball
+tarball :	
+	${MAKE} -f assets/linux.mk distro=ubuntu20 build
+	mv -v librewolf-$(full_version).en-US.ubuntu20-x86_64.tar.bz2 librewolf-$(full_version).en-US.generic-x86_64.tar.bz
+	sha256sum librewolf-$(full_version).en-US.generic-x86_64.tar.bz > librewolf-$(full_version).en-US.generic-x86_64.tar.bz.sha256sum
+	cat librewolf-$(full_version).en-US.generic-x86_64.tar.bz.sha256sum

 #
 # MacOS
@ -191,3 +215,11 @@ docker-macos-aarch64 :
 	${MAKE} -f assets/macos.mk arch=aarch64 docker
 macos-aarch64 :
 	${MAKE} -f assets/macos.mk arch=aarch64 build
+
+
+#
+# Docker in Docker (for GitLab CI)
+#
+
+docker-dind :
+	docker build -f assets/dind.Dockerfile -t registry.gitlab.com/librewolf-community/browser/bsys5/dind:latest .
--- a/README.md
+++ b/README.md
@ -0,0 +1,37 @@
+# 🔨 bsys5
+
+This repo contains scripts and assets to build the
+[LibreWolf source tarball](https://gitlab.com/librewolf-community/browser/source)
+for various platforms with docker, as well as binary releases produced by those
+scripts.
+
+<a href="https://gitlab.com/librewolf-community/browser/bsys5/-/releases"><img src="https://img.shields.io/badge/%F0%9F%93%A5-Go to Releases-blue?style=flat" height="30px"></a>
+
+## <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_                   | -                  |
+
+## Running bsys5 Locally
+
+> Note: Bsys5 only works on Linux. Other platforms are cross-compiled from
+> Linux.
+
+To build LibreWolf with bsys5 locally, just install
+[Docker](https://docs.docker.com/engine/install/) and then clone this
+repository. Then you can just build the target you want with:
+
+`make <TARGET>`, for example `make ubuntu22`\
+(See [the above table](#targets) or `make help` for a list of supported targets.)
+
+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-<TARGET>` first.
--- a/assets/dind.Dockerfile
+++ b/assets/dind.Dockerfile
@ -0,0 +1,9 @@
+FROM ubuntu:jammy
+
+RUN apt-get update &&\
+  apt-get install -y ca-certificates curl gnupg lsb-release &&\
+  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg &&\
+  echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null &&\
+  apt-get update &&\
+  apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin make wget lbzip2 &&\
+  apt-get clean
--- a/assets/linux.Dockerfile
+++ b/assets/linux.Dockerfile
@ -14,23 +14,17 @@ ENV TZ=Europe/Amsterdam


 # dependencies needed to run ./mach bootstrap
-RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget dpkg-sig ; true)
-RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget rpm-build rpm-sign ; true)
-
-# setup wasi
-RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\
-    wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$wasi_mainversion/wasi-sdk-$wasi_fullversion-linux.tar.gz &&\
-    tar xf wasi-sdk-$wasi_fullversion-linux.tar.gz &&\
-    mkdir -p $target_wasi_location &&\
-    rm -rf $target_wasi_location/wasi-sysroot &&\
-    cp -r wasi-sdk-$wasi_fullversion/share/wasi-sysroot $target_wasi_location &&\
-    rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-*
+RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install python3 python3-dev python3-pip wget dpkg-sig ; true)
+RUN ( dnf -y upgrade && dnf -y install python3 python3-devel wget rpm-build rpm-sign ; true)
+RUN ( zypper -n in mercurial python3 python3-pip python3-devel wget rpm-build ; true)

 # 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 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 &&\
    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 &&\
+    (cd /root/.mozbuild && /tmp/librewolf-$version-$source_release/mach artifact toolchain --from-build sysroot-wasm32-wasi) &&\
    /root/.cargo/bin/cargo install cbindgen &&\
    cd .. &&\
    rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
--- a/assets/linux.build-rpm.sh
+++ b/assets/linux.build-rpm.sh
@ -39,6 +39,7 @@ echo '---'

 rm -rf rpmbuild
 mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+rm -rf /usr/src && ln -sv /WORK /usr/src # Required for openSUSE
 sed "s/__VERSION__/$version/g" </work/librewolf.spec >/work/tmp.spec
 sed "s/__RELEASE__/$full_release/g" </work/tmp.spec >rpmbuild/SPECS/librewolf.spec

--- a/assets/linux.librewolf.spec
+++ b/assets/linux.librewolf.spec
@ -6,6 +6,7 @@ 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/linux.mk
+++ b/assets/linux.mk
@ -18,6 +18,7 @@ build : $(outfile) $(outfile).sha256sum

 $(outfile) :
 	${MAKE} work
+	if [ "$(distro)" != "tumbleweed" ]; then ln -sfv ./lw/mozconfig.new.without-bootstrap work/librewolf-$(version)-$(source_release)/mozconfig; fi
 ifeq ($(use_docker),false)
 	(cd work/librewolf-$(version)-$(source_release) && ./mach build && echo 'Packaging... (output hidden)' && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales >/dev/null)
 else
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@ -16,15 +16,6 @@ ENV wasi_mainversion 14
 # dependencies needed to run ./mach bootstrap
 RUN apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget build-essential libpython3-dev m4 unzip uuid zip libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdbus-glib-1-dev libdrm-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb rsync

-# setup wasi
-RUN export target_wasi_location=$HOME/.mozbuild/wrlb/ &&\
-    wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$wasi_mainversion/wasi-sdk-$wasi_fullversion-linux.tar.gz &&\
-    tar xf wasi-sdk-$wasi_fullversion-linux.tar.gz &&\
-    mkdir -p $target_wasi_location &&\
-    rm -rf $target_wasi_location/wasi-sysroot &&\
-    cp -r wasi-sdk-$wasi_fullversion/share/wasi-sysroot $target_wasi_location &&\
-    rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-*
-
 # setup osx sdk
 RUN mkdir -p /osx-cross/MacOSX-SDKs &&\
    cd /osx-cross/MacOSX-SDKs &&\
@ -44,11 +35,13 @@ 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 ./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/assets/macos.mozconfig
+++ b/assets/macos.mozconfig
@ -55,7 +55,3 @@ mk_add_options MOZ_CRASHREPORTER=0
 mk_add_options MOZ_DATA_REPORTING=0
 mk_add_options MOZ_SERVICES_HEALTHREPORT=0
 mk_add_options MOZ_TELEMETRY_REPORTING=0
-
-# wasi: we ask maintainers to all use this as wasi sysroot..
-# There is a script 'setup-wasi-linux.sh' that attempts to download the wasi sdk and place it into the location pointed to below.
-ac_add_options --with-wasi-sysroot=/root/.mozbuild/wrlb/wasi-sysroot
--- a/2
+++ b/2
@ -1 +1 @@
-2
+1
--- a/2
+++ b/2
@ -1 +1 @@
-102.0
+103.0.2
Author	SHA1	Message	Date
Bert van der Weerd	342da45bc2	made help message more compact	2022-08-13 11:48:48 +02:00
Malte Jürgens	4832eb0208	update to 103.0.2-1	2022-08-09 23:41:16 +02:00
Malte Jürgens	5c385c24ce	add mint21 target	2022-08-07 21:19:44 +02:00
Bert van der Weerd	f3febe32ca	Merge branch 'master' of gitlab.com:librewolf-community/browser/bsys5	2022-08-05 13:19:09 +02:00
Bert van der Weerd	ce966941fe	v103.0.1	2022-08-05 13:19:01 +02:00
Malte Jürgens	25dbc8f9bc	fix error in gitlab ci	2022-07-29 14:24:42 +02:00
stanzabird	a1831bf856	Update Makefile	2022-07-29 09:16:26 +00:00
Bert van der Weerd	f65583f9bb	updated source_release	2022-07-29 10:15:05 +02:00
Malte Jürgens	b064e0d184	allow for custom SOURCE_URL	2022-07-29 01:39:02 +02:00
Bert van der Weerd	831d38ad97	v103.0-2	2022-07-28 15:45:44 +02:00
Bert van der Weerd	016c20f0ac	Mon 25 Jul 2022 05:43:02 PM CEST	2022-07-25 17:43:02 +02:00
Malte Jürgens	46f1bf0851	add `Distribution` header to rpm specfile	2022-07-24 14:21:09 +02:00
Malte Jürgens	660c1bb4c3	update target table	2022-07-23 22:02:29 +02:00
Malte Jürgens	b35d030dcb	Fix build errors by implmenting dind on gitlab ci	2022-07-23 21:18:42 +02:00
Malte Jürgens	bf7c7fa152	bump version to 102.0.1-3	2022-07-22 00:02:06 +02:00
Malte Jürgens	e25ed5c3db	remove wasi bootstrap	2022-07-21 23:45:57 +02:00
Malte Jürgens	ea6e889fb6	add `tumbleweed` target	2022-07-21 22:38:47 +02:00
Malte Jürgens	b692336165	bump version to 102.0.1-2	2022-07-21 22:38:09 +02:00
Malte Jürgens	c784aca7ab	bootstrap wasi with `./mach artifact toolchain`	2022-07-21 21:01:31 +02:00
Bert van der Weerd	d4f4559435	v102.0.1-1	2022-07-09 12:01:40 +02:00
Bert van der Weerd	790d278b0c	added tarball target	2022-07-08 13:54:08 +02:00
Malte Jürgens	198e49b5d2	update deploy stage	2022-07-05 17:08:07 +02:00
Malte Jürgens	e33759bf56	update deploy stage	2022-07-03 14:05:36 +02:00
stanzabird	1f4ceafc71	Merge branch 'readme' into 'master' Add Readme Closes #6 See merge request librewolf-community/browser/bsys5!10	2022-07-02 18:52:26 +00:00
Malte Jürgens	30d95d570c	add readme	2022-06-06 15:32:42 +02:00
 @ -1 +1 @@
 .0
 .0.2