Merge branch 'main' of github.com:rcaelers/workrave

rcaelers · Oct 5, 2024 · b981e12 · b981e12
2 parents 0def0db + 5aa3ced
commit b981e12
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -95,6 +95,9 @@ jobs:
         run: |
           env
           pip install Ninja2
+          export SystemDrive="$SYSTEMDRIVE"
+          export SystemRoot="$SYSTEMROOT"
+          export windir="$WINDIR"
           cmake -G "Visual Studio 17 2022" -A x64 -B '${{ github.workspace }}/_build' \
             -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake \
             -DVCPKG_TARGET_TRIPLET=x64-windows \
@@ -107,6 +110,9 @@ jobs:
       - name: build
         shell: bash
         run: |
+          export SystemDrive="$SYSTEMDRIVE"
+          export SystemRoot="$SYSTEMROOT"
+          export windir="$WINDIR"
           cmake --build '${{github.workspace}}/_build' --config Release
           cmake --install '${{github.workspace}}/_build' --config Release
 

diff --git a/tools/local/cow-build.sh b/tools/local/cow-build.sh
@@ -18,12 +18,12 @@ parse_arguments() {
 
 parse_arguments $*
 
-DIST_DIRS=`find /workspace/deploy -mindepth 1 -type d -print | grep -v "v1_11" | sort -r`
+DIST_DIRS=$(find /workspace/deploy -mindepth 1 -type d -print | grep -v "v1_11" | sort -r)
 for dir in $DIST_DIRS; do
-    dist=`basename $dir`
+    dist=$(basename $dir)
     cd $dir
     echo Updating $dist builder
-    DIST=$dist cowbuilder --update
+    DIST=$dist cowbuilder --update --basepath /var/cache/pbuilder/base-$dist.cow
     echo Running build for $dist
-    DIST=$dist cowbuilder --build workrave*.dsc
+    DIST=$dist cowbuilder --build workrave*.dsc --basepath /var/cache/pbuilder/base-$dist.cow
 done
diff --git a/tools/local/ppa.sh b/tools/local/ppa.sh
@@ -149,7 +149,7 @@ build_single() {
 }
 
 build_all() {
-    for series in oracular noble jammy focal; do
+    for series in oracular noble jammy; do
         build_single $series
     done
 }

diff --git a/ui/app/org.workrave.gui.gschema.xml.in b/ui/app/org.workrave.gui.gschema.xml.in
@@ -30,6 +30,11 @@
       <summary></summary>
       <description></description>
     </key>
+    <key type="b" name="theme_dark">
+      <default>false</default>
+      <summary></summary>
+      <description></description>
+    </key>
     <key type="b" name="force-x11">
       <default>true</default>
       <summary></summary>