merge with master

2022-07-11 10:25:32 +02:00 · 2022-07-11 10:25:32 +02:00 · 7df71dc134
parent 8d30db00e9 d4f4559435
commit 7df71dc134
6 changed files with 98 additions and 15 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -186,17 +186,57 @@ 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.ubuntu21.x86_64.deb",
+            "distros": ["impish"]
+          },
+          {
+            "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"]
+          }
+        ],
+        "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"
+          }
+        ]
+      }
+      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/9
+++ b/9
@ -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-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 tarball

 version:=$(shell cat version)
 release:=$(shell cat release)
@ -38,6 +38,7 @@ help :
 	@echo "  [macos-x64_64]"
 	@echo "  [macos-aarch64]"
 	@echo "  [win64]"
+	@echo "  [tarball]"
 	@echo ""


@ -179,6 +180,12 @@ fedora36 :
 	${MAKE} -f assets/linux.mk distro=fedora36 build
 	${MAKE} -f assets/linux.artifacts.mk fc=fc36 distro=fedora36 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
--- a/README.md
+++ b/README.md
@ -0,0 +1,36 @@
+# 🔨 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, ubuntu21, ubuntu22) | -                  |
+| └─ Mint (deb)   | ✅ (mint20)                       | -                  |
+| └─ Fedora (rpm) | ✅ (fedora35, fedora36)           | -                  |
+| 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/linux.mk
+++ b/assets/linux.mk
@ -19,9 +19,9 @@ build : $(outfile) $(outfile).sha256sum
 $(outfile) :
 	${MAKE} work
 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)
+	(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
-	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "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"
+	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/$(distro) sh -c "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"
 endif
 	cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile)

--- a/assets/macos.mk
+++ b/assets/macos.mk
@ -19,9 +19,9 @@ $(outfile) :
 	${MAKE} work
 	sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig
 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)
+	(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
-	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "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"
+	docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "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"
 endif
 	cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile)

--- a/2
+++ b/2
@ -1 +1 @@
-101.0.1
+102.0.1
 @ -1 +1 @@
 .0.1
 .0.1