Update master to provide the latest 'stable' release

.github/workflows/build_gluon.yml

@@ -0,0 +1,73 @@
+name: Build Gluon
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - nightly
+    paths:
+      - ".github/workflows/build-gluon.yml"
+      - "domains/**"
+      - "site.conf"
+      - "site.mk"
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths:
+      - ".github/workflows/build-gluon.yml"
+      - "domains/**"
+      - "site.conf"
+      - "site.mk"
+jobs:
+  Configcheck:
+    outputs:
+      matrix: ${{ steps.setmatrix.outputs.matrix }}
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Auschecken
+        uses: actions/[email protected]
+        with:
+          submodules: true
+      - name: Konfigcheck
+        uses: nebularg/[email protected]
+        with:
+          files: site.conf
+          args: --config ./gluon/.luacheckrc
+      - name: Buildmatrix
+        id: setmatrix
+        run: |
+          ln -s ../ site
+          matrix=$( make -s list-targets BROKEN=1 | /bin/sed 's/$/"}/' | /bin/sed 's/^/{"target":"/' | /bin/sed ':a;N;$!ba;s/\n/,/g' )
+          echo "Targets: $matrix"
+          echo "matrix={\"include\":[$(echo $matrix)]}" >> $GITHUB_OUTPUT
+        working-directory: gluon
+  build_firmware:
+    needs: Configcheck
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.Configcheck.outputs.matrix) }}
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Auschecken
+        uses: actions/[email protected]
+        with:
+          submodules: true
+      - name: Permissions
+        run: chmod +x contrib/actions/run-build.sh contrib/actions/install-dependencies.sh
+      - name: Install Dependencies
+        run: sudo contrib/actions/install-dependencies.sh
+      - name: Build
+        run: |
+          mkdir output logs
+          ln -s ../ site
+          ../contrib/actions/run-build.sh ${{ matrix.target }} -j3
+        working-directory: gluon
+      - name: Archive build logs
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.target }}_logs
+          path: gluon/logs
+      - name: Archive build output
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.target }}_output
+          path: gluon/output

.github/workflows/build_manual .yml

@@ -1,67 +1,83 @@
 name: Build ffef firmware
-
 on:
   workflow_dispatch:
-   inputs:
+    inputs:
       branch:
         description: 'Which branch?'
         required: true
         default: 'nightly'
+      make_options:
+        description: 'Make Options'
+        required: true
+        default: '-j3'
+        type: choice
+        options:
+          - '-j3'
+          - '-j2'
+          - '-j1'
+          - 'V=s'
 jobs:
   Configcheck:
-     outputs:
-       matrix: ${{ steps.setmatrix.outputs.matrix }}
-     runs-on: ubuntu-latest
-     steps:
+    outputs:
+      matrix: ${{ steps.setmatrix.outputs.matrix }}
+    runs-on: ubuntu-20.04
+    steps:
       - name: Auschecken
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3.5.3
         with:
-            ref: ${{ github.event.inputs.branch }}
-            submodules: recursive
-      - name: spellcheck
+          ref: ${{ github.event.inputs.branch }}
+          submodules: true
+      - name: Konfigcheck
         uses: nebularg/[email protected]
         with:
-            files: site.conf
-            args: --config ./gluon/.luacheckrc         
+          files: site.conf
+          args: --config ./gluon/.luacheckrc
       - name: Buildmatrix
         id: setmatrix
-        run: | 
-         matrix=$( ln -s ../ gluon/site; cd gluon; make -s list-targets BROKEN=1 |  /bin/sed 's/$/"}/' |   /bin/sed 's/^/{"target":"/' | /bin/sed ':a;N;$!ba;s/\n/,/g' )
-         echo ::set-output name=matrix::{\"include\":[$(echo $matrix)]}
+        run: |
+          ln -s ../ site
+          matrix=$( make -s list-targets BROKEN=1 | /bin/sed 's/$/"}/' | /bin/sed 's/^/{"target":"/' | /bin/sed ':a;N;$!ba;s/\n/,/g' )
+          echo "Targets: $matrix"
+          echo "matrix={\"include\":[$(echo $matrix)]}" >> $GITHUB_OUTPUT
+        working-directory: gluon
   build_firmware:
     needs: Configcheck
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.Configcheck.outputs.matrix) }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Auschecken
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3.5.3
         with:
           ref: ${{ github.event.inputs.branch }}
-          submodules: recursive
+          submodules: true
       - name: Permissions
         run: chmod +x contrib/actions/run-build.sh contrib/actions/install-dependencies.sh
       - name: Install Dependencies
         run: sudo contrib/actions/install-dependencies.sh
       - name: Build
-        run: contrib/actions/run-build.sh ${{ matrix.target }}
+        run: |
+          mkdir output logs
+          ln -s ../ site
+          ../contrib/actions/run-build.sh ${{ matrix.target }} ${{ inputs.make_options }}
+        working-directory: gluon
       - name: Archive build logs
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.target }}_logs
-          path: logs
+          path: gluon/logs
       - name: Archive build output
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.target }}_output
           path: gluon/output
       - name: upload
+        if: github.repository == 'FreifunkErfurt/site-ffef'
         env:
-         SSH_KEY: ${{ secrets.GITSYNC_PRIVATE_KEY }}
+          SSH_KEY: ${{ secrets.GITSYNC_PRIVATE_KEY }}
         run: |
-         eval "$(ssh-agent -s)"
-         ssh-add - <<< "${SSH_KEY}"
-         rsync -avz '-e ssh -o StrictHostKeyChecking=no -p2215' gluon/output/ [email protected]:/hotfolder/${{ github.event.inputs.branch }}/
-
+          eval "$(ssh-agent -s)"
+          ssh-add - <<< "${SSH_KEY}"
+          rsync -avz '-e ssh -o StrictHostKeyChecking=no -p2215' gluon/output/ [email protected]:/hotfolder/${{ github.event.inputs.branch }}/

.github/workflows/build_single.yml

@@ -0,0 +1,55 @@
+
+name: Build Single
+on:
+  workflow_dispatch:
+    inputs:
+      targets:
+        description: 'Which targets?'
+        required: true
+        default: '[ar71xx-tiny, lantiq-xrx200, lantiq-xway, x86-generic]'
+jobs:
+  Configcheck:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Auschecken
+        uses: actions/[email protected]
+        with:
+          submodules: true
+      - name: Konfigcheck
+        uses: nebularg/[email protected]
+        with:
+          files: site.conf
+          args: --config ./gluon/.luacheckrc
+  build_firmware:
+    needs: Configcheck
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ${{ inputs.targets }}
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Auschecken
+        uses: actions/[email protected]
+        with:
+          submodules: true
+      - name: Permissions
+        run: chmod +x contrib/actions/run-build.sh contrib/actions/install-dependencies.sh
+      - name: Install Dependencies
+        run: sudo contrib/actions/install-dependencies.sh
+      - name: Build
+        run: |
+          mkdir output logs
+          ln -s ../ site
+          ../contrib/actions/run-build.sh ${{ matrix.target }} -j3
+        working-directory: gluon
+      - name: Archive build logs
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.target }}_logs
+          path: gluon/logs
+      - name: Archive build output
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.target }}_output
+          path: gluon/output

.gitignore

@@ -0,0 +1 @@
+.bash_history