Replace luci.jsonc with pure Lua JSON library

Signed-off-by: Gerard Hickey <[email protected]>
hickey · Apr 6, 2024 · fd11d88 · fd11d88
1 parent e447b67
commit fd11d88
Show file tree

Hide file tree

Showing 6 changed files with 467 additions and 21 deletions.
diff --git a/.github/workflows/build-packages.yaml b/.github/workflows/build-packages.yaml
@@ -19,18 +19,18 @@ jobs:
 
           echo "build_version=$version" >> $GITHUB_OUTPUT
 
-  build-meshchat-package:
+  build-meshchat-openwrt-package:
     needs: calculate-version
     uses:
-      ./.github/workflows/workflow-meshchat-package.yaml
+      ./.github/workflows/workflow-meshchat-openwrt-package.yaml
     with:
       build_version: ${{ needs.calculate-version.outputs.build_version }}
       build_dir: package/meshchat-ipkg
 
-  build-meshchat-api-package:
+  build-meshchat-debian-package:
     needs: calculate-version
     uses:
-      ./.github/workflows/workflow-meshchat-api-package.yaml
+      ./.github/workflows/workflow-meshchat-debian-package.yaml
     with:
       build_version: ${{ needs.calculate-version.outputs.build_version }}
       build_dir: package/meshchat-ipkg
diff --git a/.github/workflows/workflow-meshchat-debian-package.yaml b/.github/workflows/workflow-meshchat-debian-package.yaml
@@ -0,0 +1,42 @@
+name: Build MeshChat Package
+on:
+  workflow_call:
+    inputs:
+      build_version:
+        required: true
+        type: string
+      build_dir:
+        required: true
+        type: string
+      ref:
+        required: false
+        type: string
+        default: ${{ github.ref_name }}
+
+jobs:
+  create-meshchat-debian-package:
+    runs-on: ubuntu-latest
+    # container:
+    #   image: registry.gitlab.com/wt0f/gitlab-runner-images/shell:latest
+    outputs:
+      package_file: ${{ steps.detect-package-file.outputs.file }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.ref }}
+      # - run: info "Populating the filesystem with MeshChat files"
+      - run: echo ${{ inputs.build_version }} > VERSION
+      - run: package/populate-meshchat-fs.sh ${{ inputs.build_dir }} debian
+      # - run: info "Updating version numbers to "
+      - run: package/update-version.sh ${{ inputs.build_dir }}
+      # - run: info "Packing up MeshChat files"
+      - run: dpkg-deb --root-owner-group --build ${{ inputs.build_dir }}
+      - run: mv meshchat-deb.deb meshchat_${{ inputs.build_version }}_all.deb
+      - id: detect-package-file
+        run: echo "file=meshchat_${{inputs.build_version }}_all.deb" >> $GITHUB_OUTPUT
+      - run: echo "${{ steps.detect-package-file.outputs.file }}"
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.detect-package-file.outputs.file }}
+          path: ${{ steps.detect-package-file.outputs.file }}
diff --git a/.../workflows/workflow-meshchat-package.yaml → ...ws/workflow-meshchat-openwrt-package.yaml b/.../workflows/workflow-meshchat-package.yaml → ...ws/workflow-meshchat-openwrt-package.yaml
@@ -14,7 +14,7 @@ on:
         default: ${{ github.ref_name }}
 
 jobs:
-  create-meshchat-package:
+  create-meshchat-openwrt-package:
     runs-on: ubuntu-latest
     # container:
     #   image: registry.gitlab.com/wt0f/gitlab-runner-images/shell:latest
@@ -27,7 +27,7 @@ jobs:
           ref: ${{ inputs.ref }}
       # - run: info "Populating the filesystem with MeshChat files"
       - run: echo ${{ inputs.build_version }} > VERSION
-      - run: package/populate-meshchat-fs.sh ${{ inputs.build_dir }}
+      - run: package/populate-meshchat-fs.sh ${{ inputs.build_dir }} openwrt
       # - run: info "Updating version numbers to "
       - run: package/update-version.sh ${{ inputs.build_dir }}
       # - run: info "Packing up MeshChat files"