build(deps): bump actions/checkout from 3 to 4

.github/dependabot.yml

@@ -7,6 +7,28 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
+    target-branch: "stable"
+    labels:
+      - "stable"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily" 
+
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "next"
+    labels: 
+      - "next"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "legacy"
+    labels: 
+      - "legacy"
     schedule:
       # Check for updates to GitHub Actions every weekday
       interval: "daily"

.github/workflows/backport.yml

@@ -7,6 +7,7 @@ on:  # yamllint disable-line rule:truthy
 permissions:
   contents: write # so it can comment
   pull-requests: write # so it can create pull requests
+  actions: write # so it can backport workflows
 jobs:
   backport:
     name: Backport pull request

.github/workflows/firmware.yml

@@ -12,7 +12,9 @@ on:
       - '.github/ISSUE_TEMPLATE'
       - '.github/*.yml'
       - '.github/workflows/backport.yml'
+      - '.github/workflows/shellcheck.yml'
       - 'contrib/sign.sh'
+      - 'dependabot.yml'
 
 jobs:
   generate_target_matrix:
@@ -43,32 +45,38 @@ jobs:
           sudo rm -rf /usr/share/dotnet
           sudo rm -rf /usr/local/lib/android
           sudo rm -rf /opt/ghc
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Install build dependencies
-        run: |
-          sudo -E ./scripts/install_build_dependencies.sh
-      - name: pre-build without ffmuc-mesh-vpn-wireguard-vxlan (workaround for x86-64)
-        if: matrix.target == 'x86-64'
-        run: |
-          sed -i '/ffmuc-mesh-vpn-wireguard-vxlan/d' site.mk
-          make BROKEN=1 GLUON_TARGETS=${{ matrix.target }} V=s
-          git checkout site.mk
+
+      - name: make dirs
+        run: mkdir -p logs gluon-build output test
+
+      - name: build docker image
+        run: docker build -t site-ffm -f Dockerfile_build .
+
       - name: build target ${{ matrix.target }}
         id: compile
         run: |
-          git checkout -b patched ${GITHUB_SHA}
-          make BROKEN=1 GLUON_TARGETS=${{ matrix.target }} V=s
+          docker run --rm -v $(pwd):/site-ffm:ro -v $(pwd)/gluon-build:/site-ffm/gluon-build:rw -v $(pwd)/output:/site-ffm/output:rw -w /site-ffm -u $UID site-ffm make V=s GLUON_TARGETS=${{ matrix.target }} |& tee logs/build_${{ matrix.target }}_$(date --iso=s | sed 's/:/-/g').log
           echo "status=success" >> $GITHUB_OUTPUT
+
       - name: Upload firmware ${{ matrix.target }}
         uses: actions/upload-artifact@v4
         if: steps.compile.outputs.status == 'success'
         with:
           name: ${{ matrix.target }}_output
           path: ./output
 
+      - name: Upload firmware ${{ matrix.target }} logs
+        uses: actions/upload-artifact@v4
+        if: steps.compile.outputs.status == 'success'
+        with:
+          name: ${{ matrix.target }}_logs
+          path: ./logs
+
   create_release:
     runs-on: ubuntu-latest
     needs:
@@ -85,6 +93,9 @@ jobs:
           for output in *_output; do
             tar zcvf "${output}.tar.gz" "${output}"
           done
+          for logs in *_logs; do
+            tar zcvf "${logs}.tar.gz" "${logs}"
+          done  
       - name: Create Release & Upload Release Assets
         uses: softprops/action-gh-release@v2
         with:
@@ -97,3 +108,4 @@ jobs:
           generate_release_notes: true
           files: |
             ./*_output.tar.gz
+            ./*_logs.tar.gz

site.conf

@@ -41,6 +41,7 @@
   },
 
   mesh_vpn = {
+    enabled = true,
     bandwidth_limit = {
       enabled = false,
       egress = 1500,

site.mk

@@ -32,7 +32,7 @@ DEFAULT_GLUON_RELEASE := v2022.10.1~exp$(shell date '+%Y%m%d%H')
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
-GLUON_PRIORITY ?= 0
+GLUON_PRIORITY ?= 7
 
 GLUON_REGION ?= eu
 

targets

@@ -1,26 +1 @@
-ath79-generic
-ath79-mikrotik
-ath79-nand
-bcm27xx-bcm2708
-bcm27xx-bcm2709
-bcm27xx-bcm2710
-bcm27xx-bcm2711
-ipq40xx-generic
-ipq40xx-mikrotik
-ipq806x-generic
-lantiq-xrx200
-lantiq-xway
-mediatek-mt7622
-mpc85xx-p1010
-mpc85xx-p1020
-mvebu-cortexa9
-ramips-mt7620
-ramips-mt7621
-ramips-mt76x8
-realtek-rtl838x
-rockchip-armv8
-sunxi-cortexa7
 x86-64
-x86-generic
-x86-geode
-x86-legacy