updating packageing and versioning strategy

Author: andibraeu

.github/workflows/assemblefirmware.yml

@@ -160,7 +160,7 @@ jobs:
         ./compile_packages.sh -t ${{ matrix.target }} -o ${{ matrix.openwrt }}
 
     - name: upload packages directory
-      if: github.event_name == 'push'
+      if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
       env:
         SSH_KEY: ${{ secrets.BUILDBOT_PRIVATE_KEY }}
       run: |
@@ -172,28 +172,47 @@ jobs:
         subtarget="$(echo "${customtarget}" | cut -d'-' -f 1)"
         openwrt_release="$(echo "${{ matrix.openwrt }}" | cut -d'.' -f 1-2)"
         
+        if [ "${{ github.ref }}" = "refs/heads/weimarnetz-tng" ]; then
+          FEED_CHANNEL="stable"
+        else
+          FEED_CHANNEL="testing"
+        fi
+        
         # Process packages directory (unified feed structure)
         for feed_dir in packages/* ; do
           if [ -d "$feed_dir" ]; then
             feed_name=$(basename "$feed_dir")
             
-            # Create local structure: <openwrt_release>/<maintarget>/<subtarget>/<feed_name>
-            mkdir -p "upload_temp/brauhaus/packages/$openwrt_release/$maintarget/$subtarget/$feed_name"
+            # Create local structure: <channel>/<openwrt_release>/<maintarget>/<subtarget>/<feed_name>
+            mkdir -p "upload_temp/brauhaus/packages/$FEED_CHANNEL/$openwrt_release/$maintarget/$subtarget/$feed_name"
             
             # Copy the build info JSON
-            cp ../build_info/package_build.json "upload_temp/brauhaus/packages/$openwrt_release/$maintarget/$subtarget/$feed_name/"
+            cp ../build_info/package_build.json "upload_temp/brauhaus/packages/$FEED_CHANNEL/$openwrt_release/$maintarget/$subtarget/$feed_name/"
             
             # Copy package files
-            find "./$feed_dir" -maxdepth 1 -type f -exec cp {} "upload_temp/brauhaus/packages/$openwrt_release/$maintarget/$subtarget/$feed_name/" \;
+            find "./$feed_dir" -maxdepth 1 -type f -exec cp {} "upload_temp/brauhaus/packages/$FEED_CHANNEL/$openwrt_release/$maintarget/$subtarget/$feed_name/" \;
           fi
         done
         
-        # Upload: -R/--relative + /./ in source builds $openwrt_release/... under dest without --mkpath (rrsync-friendly)
-        echo "Uploading packages to /brauhaus/packages/$openwrt_release/$maintarget/$subtarget/"
+        # Upload: -R/--relative + /./ in source builds $FEED_CHANNEL/... under dest without --mkpath (rrsync-friendly)
+        echo "Uploading $FEED_CHANNEL packages to /brauhaus/packages/$FEED_CHANNEL/$openwrt_release/$maintarget/$subtarget/"
         rsync -avz --delete -R '-e ssh -o StrictHostKeyChecking=no -p22223' \
-          "upload_temp/brauhaus/packages/./$openwrt_release/$maintarget/$subtarget/" \
+          "upload_temp/brauhaus/packages/./$FEED_CHANNEL/$openwrt_release/$maintarget/$subtarget/" \
           "buildbot@buildbot.weimarnetz.de:/brauhaus/packages/"
 
+  # Summary job so branch protection only needs one required check instead of all matrix jobs
+  build_status:
+    needs: [compile_packages]
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check matrix result
+        run: |
+          if [ "${{ needs.compile_packages.result }}" != "success" ]; then
+            echo "::error::At least one build in the matrix failed."
+            exit 1
+          fi
+
   # Separate job that runs after all matrix jobs are completed
   trigger_firmware_build:
     needs: [collect_build_info, compile_packages]

.github/workflows/version-check.yml

@@ -0,0 +1,61 @@
+name: Version Check
+
+on:
+  pull_request:
+    branches: [weimarnetz-tng]
+    paths:
+      - 'utils/*/**'
+      - 'net/*/**'
+
+jobs:
+  check-version-bump:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Check that changed packages have a version bump
+        run: |
+          BASE="${{ github.event.pull_request.base.sha }}"
+          FAILED=0
+
+          changed_dirs=$(git diff --name-only "$BASE"...HEAD -- 'utils/' 'net/' \
+            | grep -oP '^(utils|net)/[^/]+' | sort -u)
+
+          if [ -z "$changed_dirs" ]; then
+            echo "No package directories changed."
+            exit 0
+          fi
+
+          for pkg_dir in $changed_dirs; do
+            makefile="$pkg_dir/Makefile"
+
+            if [ ! -f "$makefile" ]; then
+              echo "::notice::$pkg_dir has no Makefile, skipping."
+              continue
+            fi
+
+            if ! git show "$BASE:$makefile" >/dev/null 2>&1; then
+              echo "::notice::$makefile is new in this PR, skipping version check."
+              continue
+            fi
+
+            old_version=$(git show "$BASE:$makefile" \
+              | grep -E '^PKG_(VERSION|RELEASE):=' | sort | tr '\n' '|')
+            new_version=$(grep -E '^PKG_(VERSION|RELEASE):=' "$makefile" \
+              | sort | tr '\n' '|')
+
+            if [ "$old_version" = "$new_version" ]; then
+              echo "::error file=$makefile::$pkg_dir was changed but PKG_VERSION or PKG_RELEASE was not bumped."
+              FAILED=1
+            else
+              echo "::notice file=$makefile::$pkg_dir version bump OK ($old_version -> $new_version)"
+            fi
+          done
+
+          if [ "$FAILED" -eq 1 ]; then
+            echo ""
+            echo "::error::At least one package was changed without a version bump. Please increment PKG_VERSION or PKG_RELEASE."
+            exit 1
+          fi

README.md

@@ -17,60 +17,35 @@ Device packages must be space separated, prepend a `-` if you don't want a packa
 
 In the `packagelist` repository you can configure packages that are globally installed. The suffixes after `_` correspond to the suffixes in the `profiles` directory. It is possible to define packages for every OpenWrt Build we support.
 
-Currently we build images for OpenWrt 21.02 and OpenWrt 22.03.
+Currently we build packages for OpenWrt 24.10 and OpenWrt 25.12.
 
-## Cross-Repository Builds
+## Package Versioning
 
-This repository is responsible for developing and building OpenWrt packages. After a successful package build, a firmware build is automatically triggered in the [imagebuilder](https://github.com/weimarnetz/imagebuilder) repository.
+Every package must define `PKG_VERSION` and `PKG_RELEASE` in its Makefile:
 
-### Workflow
+```makefile
+PKG_VERSION:=1.2.0
+PKG_RELEASE:=1
+```
 
-1. Changes to package sources in this repository are pushed
-2. GitHub Actions compiles the packages for various target architectures
-3. The compiled packages are uploaded to the build server
-4. After all package builds complete successfully, a repository dispatch event is sent to the imagebuilder repository
-5. The imagebuilder repository then automatically starts its firmware builds using the latest packages
+- `PKG_VERSION` is the semantic version of the package. Bump it when the package content changes.
+- `PKG_RELEASE` is the packaging release counter. Bump it for packaging-only changes (e.g. dependency adjustments) and reset it to `1` when `PKG_VERSION` is incremented.
 
-### Setting up Cross-Repository Communication
+A CI check on pull requests verifies that at least one of these values was incremented when package files are modified. The check must pass before the PR can be merged.
 
-Communication between repositories is handled via a GitHub App. Here's how to set it up:
+## Releases and Feeds
 
-1. **Create a GitHub App**:
-   - Go to GitHub Settings → Developer settings → GitHub Apps → New GitHub App
-   - Enter a name (e.g., "Weimarnetz Build Dispatcher")
-   - Homepage URL: Repository or organization URL
-   - Disable Webhook (not needed)
-   - Under "Repository permissions":
-     - **Metadata**: `Read-only`
-     - **Contents**: `Read and write` (required for repository_dispatch)
-   - Click "Create GitHub App"
+The `weimarnetz-tng` branch is the **stable** branch. All development happens in feature branches and is merged via pull requests.
 
-2. **Install the App in repositories**:
-   - After creation, select "Install App" in the left menu
-   - Choose the "weimarnetz" organization
-   - Select "Only select repositories" and mark both the packages and imagebuilder repositories
-   - Click "Install"
+- **Stable feed**: Packages are built and uploaded automatically when a PR is merged into `weimarnetz-tng`.
+- **Testing feed**: Any branch can be built into the testing feed by manually triggering the build workflow via *Actions → Weimarnetz Package Build → Run workflow*.
 
-3. **Generate App ID and Private Key**:
-   - Return to the App configuration page
-   - Note the "App ID" (a number)
-   - Scroll down to "Private keys" and click "Generate a private key"
-   - Save the downloaded file securely
+Devices can subscribe to either feed:
 
-4. **Add Secrets to the repository**:
-   - Go to repository settings → Secrets and variables → Actions
-   - Create two new secrets:
-     - `GH_APP_ID`: The App ID from step 3
-     - `GH_APP_PRIVATE_KEY`: The contents of the downloaded private key file
+```
+# Stable (default)
+src/gz weimarnetz_stable https://buildbot.weimarnetz.de/brauhaus/packages/stable/<openwrt_release>/<target>/<subtarget>/weimarnetz
 
-5. **Configure the workflow**:
-   - The workflow `.github/workflows/assemblefirmware.yml` already contains the necessary configuration to trigger the imagebuilder after successful package builds
-
-### Troubleshooting
-
-If the cross-repository trigger doesn't work:
-
-- Verify that the GitHub App has the correct permissions
-- Ensure the App is installed in both repositories
-- Check the secrets `GH_APP_ID` and `GH_APP_PRIVATE_KEY`
-- Review GitHub Actions logs for detailed error messages
+# Testing
+src/gz weimarnetz_testing https://buildbot.weimarnetz.de/brauhaus/packages/testing/<openwrt_release>/<target>/<subtarget>/weimarnetz
+```

utils/luci-app-owm/Makefile

@@ -8,7 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-owm
-PKG_RELEASE:=0.8.0
+PKG_VERSION:=0.8.0
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

utils/weimarnetz-button-config/Makefile

@@ -1,7 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weimarnetz-button-config
-PKG_RELEASE:=1.0.0
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
 
 define Package/weimarnetz-button-config
   SECTION:=luci

utils/weimarnetz-metrics-exporter/Makefile

@@ -1,7 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weimarnetz-metrics-exporter
-PKG_RELEASE:=1.0.1
+PKG_VERSION:=1.0.1
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

utils/weimarnetz-owm-exporter/Makefile

@@ -1,7 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=weimarnetz-owm-exporter
-PKG_RELEASE:=1.2.0
+PKG_VERSION:=1.2.0
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)