Add manual job to build Zim develop branch

.gitlab-ci.yml

@@ -13,12 +13,6 @@ stages:
   - prepare
   - build
 
-increment_buildnumber:
-  stage: prepare
-  script:
-    # requires variables in CI settings: PRIVATE_TOKEN (api access), BUILD_NUMBER
-    - 'curl -X PUT -s -f --header "PRIVATE-TOKEN: $PRIVATE_TOKEN" https://gitlab.com/api/v4/projects/$CI_PROJECT_ID/variables/BUILD_NUMBER -d value=$((BUILD_NUMBER + 1))'
-
 .config_elcapitan:
   variables:
     SDKROOT: /opt/sdks/MacOSX10.11.4.sdk
@@ -50,12 +44,12 @@ increment_buildnumber:
         exit 1
       fi
 
-verify_sdk_elcapitan:
+verify_sdk:elcapitan:
   extends:
     - .config_elcapitan
     - .verify_sdk
 
-verify_sdk_catalina:
+verify_sdk:catalina:
   extends:
     - .config_catalina
     - .verify_sdk
@@ -64,6 +58,10 @@ verify_sdk_catalina:
   stage: build
   variables:
     VERSION: $BUILD_NUMBER
+  before_script:
+    # Increment BUILD_NUMBER for the next job.
+    # requires variables in CI settings: PRIVATE_TOKEN (api access), BUILD_NUMBER
+    - 'curl -X PUT -s -f --header "PRIVATE-TOKEN: $PRIVATE_TOKEN" https://gitlab.com/api/v4/projects/$CI_PROJECT_ID/variables/BUILD_NUMBER -d value=$((BUILD_NUMBER + 1))'
   script:
     - ./build_toolset.sh
     - ./build_zim.sh
@@ -74,12 +72,18 @@ verify_sdk_catalina:
     paths:
       - Zim.dmg
 
-build_zim_elcapitan:
+build_zim:elcapitan:
   extends:
     - .config_elcapitan
     - .build_zim
 
-build_zim_catalina:
+build_zim:catalina:
   extends:
     - .config_catalina
     - .build_zim
+
+build_zim:elcapitan:develop:
+  extends: build_zim:elcapitan
+  variables:
+    VERSION: develop
+  when: manual

packages/zim.sh

@@ -26,14 +26,20 @@ ZIM_APP_LIB_DIR=$ZIM_APP_RES_DIR/lib
 ZIM_APP_FRA_DIR=$ZIM_APP_CON_DIR/Frameworks
 ZIM_APP_PLIST=$ZIM_APP_CON_DIR/Info.plist
 
-if [ -z "$ZIM_VER" ]; then
+if   [ -z "$ZIM_VER" ]; then
   ZIM_VER=0.74.3
   ZIM_PATCHES="$SELF_DIR/open_page_accelerators.patch"
+  ZIM_URL=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/refs/\
+tags/$ZIM_VER.tar.gz
+elif [ "$ZIM_VER" = "develop" ]; then
+  ZIM_URL=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/refs/\
+heads/develop.tar.gz
+  # TODO: this is only desigend for being used in CI, will fail otherwise
+  ZIM_VER=$(grep __version__ zim/__init__.py | awk -F "'" '{ print $2 }')
+else
+  : # TODO: unhandled, this will crash
 fi
 
-ZIM_URL=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/refs/tags/\
-$ZIM_VER.tar.gz
-
 #----------------------------------------- Python runtime to be bundled with Zim
 
 ZIM_PYTHON_VER_MAJOR=3
@@ -69,13 +75,13 @@ ZIM_PYTHON_PKG_XDOT=xdot==1.2
 function zim_install
 {
   local zim_source_dir
-  zim_source_dir=$SRC_DIR/zim-desktop-wiki-$(basename -s .tar.gz "$ZIM_URL")
+  zim_source_dir=$SRC_DIR/zim-desktop-wiki-$ZIM_VER
 
   rm -rf "$zim_source_dir"
   rm -f "$SRC_DIR"/zim-desktop-wiki
 
-  curl -o "$PKG_DIR"/zim-desktop-wiki-"$(basename "$ZIM_URL")" -L "$ZIM_URL"
-  tar -C "$SRC_DIR" -xf "$PKG_DIR"/zim-desktop-wiki-"$(basename "$ZIM_URL")"
+  curl -o "$PKG_DIR/zim-desktop-wiki-$ZIM_VER" -L "$ZIM_URL"
+  tar -C "$SRC_DIR" -xf "$PKG_DIR/zim-desktop-wiki-$ZIM_VER"
   ln -s "$zim_source_dir" "$SRC_DIR"/zim-desktop-wiki   # used by zim.bundle
 
   (