Merge pull request 'settings_submodule' (!70) from settings_submodule into main

Reviewed-on: https://codeberg.org/librewolf/source/pulls/70

.forgejo/workflows/push.yaml

@@ -8,6 +8,8 @@ jobs:
       - run: apk update -U && apk add make gnupg patch python3 bash xz nodejs git
         shell: sh
       - uses: actions/checkout@v3
+        with:
+          submodules: true
       - run: make fetch-upstream-woodpecker
       - run: make check-patchfail-woodpecker
       - run: make all

.gitlab-ci.yml

@@ -4,10 +4,11 @@ stages:
   - release
 
 
-
 Linux:
   stage: test
   allow_failure: true
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - autoscale
   image: debian
@@ -25,6 +26,8 @@ Linux:
 macOS:
   stage: test
   allow_failure: true
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   when: manual
   tags:
     - autoscale
@@ -43,6 +46,8 @@ macOS:
 Windows:
   stage: test
   allow_failure: true
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   when: manual
   tags:
     - autoscale

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "settings"]
+	path = settings
+	url = https://codeberg.org/librewolf/settings.git

Makefile

@@ -47,6 +47,7 @@ help :
 	@echo "docker:" $(docker_targets)
 
 check :
+	-bash -c ./scripts/update-settings-module.sh
 	python3 scripts/update-version.py
 	cut -f1 version > version.tmp
 	mv -vf version.tmp version
@@ -55,9 +56,9 @@ check :
 	@echo "LibreWolf release : " $$(cat release)
 	@echo ""
 
-
 update :
-	git submodule update --recursive --remote
+	-bash -c ./scripts/update-settings-module.sh
+#	git submodule update --recursive --remote
 
 
 all : $(lw_source_tarball)

scripts/librewolf-patches.py

@@ -117,9 +117,9 @@ def librewolf_patches():
 
     exec('mkdir -p lw')
     enter_srcdir('lw')
-    exec('wget -q https://codeberg.org/librewolf/settings/raw/branch/master/librewolf.cfg')
-    exec('wget -q https://codeberg.org/librewolf/settings/raw/branch/master/distribution/policies.json')
-    exec('wget -q https://codeberg.org/librewolf/settings/raw/branch/master/defaults/pref/local-settings.js')
+    exec('cp -v ../../settings/librewolf.cfg .')
+    exec('cp -v ../../settings/distribution/policies.json .')
+    exec('cp -v ../../settings/defaults/pref/local-settings.js .')
     leave_srcdir();
 
 

scripts/update-settings-module.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -eu
+
+cd settings
+git checkout master
+git pull origin master
+cd ..
+
+git add settings
+git commit -m "Updated settings submodule to the latest version"
+git push

settings

@@ -0,0 +1 @@
+Subproject commit b587388bdbe63511c478cb8b5f82c2e80040414c