Merge pull request #7 from sirtoobii/develop

Simplyfied deb build, version++

.github/workflows/build-deb.yaml

@@ -0,0 +1,75 @@
+name: Build .deb packages
+
+on:
+  push:
+    tags:
+      - "v*"
+
+
+jobs:
+  build_deb_packages:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - distribution: debian
+            version: 10
+            node_version: '16.x'
+          - distribution: debian
+            version: 11
+            node_version: '18.x'
+          - distribution: ubuntu
+            version: 18.04
+            node_version: '16.x'
+          - distribution: ubuntu
+            version: 20.04
+            node_version: '18.x'
+          - distribution: ubuntu
+            version: 22.04
+            node_version: '18.x'
+
+
+    runs-on: ubuntu-latest
+    name: Build package for ${{ matrix.distribution }} ${{ matrix.version }}
+    container:
+      image: ${{ matrix.distribution }}:${{ matrix.version }}
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      # sneaky hack to make caches work because the cache action lives outside the container
+      options: --mount type=volume,dst=/__w/wgwrangler/wgwrangler/,volume-driver=local,volume-opt=type=none,volume-opt=o=bind,volume-opt=device=${{ github.workspace }}
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node_version }}
+      - name: Install OS requirements
+        run: apt-get update && apt-get install -yq perl make gcc devscripts openssl pkg-config libssl-dev debhelper automake libkrb5-dev libqrencode-dev g++ zlib1g-dev
+      - name: Node Cache
+        id: node-cache
+        uses: actions/cache@v3
+        with:
+          path: frontend/node_modules
+          key: ${{ matrix.distribution }}-node-${{ matrix.node_version }}-${{ hashFiles('package.json', '*/package.json','qx-lock.json', '*/qx-lock.json') }}
+          restore-keys: |
+            ${{ matrix.distribution }}-node-${{ matrix.node_version }}-
+      - name: CPAN cache
+        id: cpan_cache
+        uses: actions/cache@v3
+        with:
+          path: thirdparty
+          key: ${{ matrix.distribution }}-cpan-${{ matrix.version }}-${{ hashFiles('cpanfile', '*/cpanfile', 'Makefile.am', '*/Makefile.am') }}
+      - name: Build package
+        id: build_package
+        run: bash make-deb.sh ${{ matrix.distribution }} ${{ matrix.version }}
+      - name: Release deb files
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: ${{ github.workspace }}/${{ steps.build_package.outputs.package_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/unit-tests.yaml

@@ -34,20 +34,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - name: CPAN Cache
       id: cpan-cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: thirdparty
         key: ${{ matrix.os }}-cpan-${{ matrix.perl }}-${{ hashFiles('**/cpanfile') }}
     - name: Node Cache
       id: node-cache
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: frontend/node_modules
         key: ${{ matrix.os }}-node-${{ matrix.node }}-${{ hashFiles('**/package.json') }}

CHANGES

@@ -1,3 +1,10 @@
+wg-wrangler (0.3.0) unstable; urgency=medium
+
+  * Fixed incorrect handling of #+comment tags
+  * Extended IPManager module, we now support address reservations and per interface defaults
+
+ -- Tobias Bossert <[email protected]>  Wed, 22 Mar 2023 12:12:48 +0100
+
 wg-wrangler (0.2.3) unstable; urgency=medium
 
    * Raised wg-meta version to 0.3.3 to fix deadlock when calling the reload callback

VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

build_local.sh

@@ -30,11 +30,6 @@ cp -r . /src
 
 cd /src
 
-# workaround for debhelper bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=897569
-mkdir -p deb_build_home
-ls | grep -v deb_build_home | xargs mv -t deb_build_home # move everything except deb_build_home
-cd deb_build_home
-
 dh_clean
 dpkg-buildpackage -us -uc -nc
 

debian/changelog

@@ -0,0 +1 @@
+../CHANGES

make-deb.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -ex
+
+DISTRIBUTION_NAME=$1
+DISTRIBUTION_VERSION=$2
+
+# Overriding $HOME to prevent permissions issues when running on github actions
+mkdir -p /tmp/home
+chmod 0777 /tmp/home
+export HOME=/tmp/home
+
+dh_clean
+dpkg-buildpackage -us -uc -nc
+
+release_number=${DISTRIBUTION_VERSION/\./\_}
+package_name=$(basename ../wg-wrangler_*.deb | sed 's/.deb$//')_${DISTRIBUTION_NAME}-${release_number}.deb
+mv ../wg-wrangler_*.deb "$package_name"
+
+# set action output
+echo "package_name=$package_name" >>$GITHUB_OUTPUT