add build job for branches

.github/workflows/build-packages.yaml

@@ -0,0 +1,36 @@
+name: Build MeshChat Packages
+on: push
+
+jobs:
+  calculate-version:
+    runs-on: ubuntu-latest
+    outputs:
+      build_version: ${{ steps.build-version-slug.outputs.build_version }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - id: build-version-slug
+        run: |
+          date=$(date +%Y%m%d)
+          branch="${GITHUB_REF_NAME}"
+          commit=$(git rev-parse --short HEAD)
+          version="${date}-${branch}-${commit}"
+
+          echo "build_version=$version" >> $GITHUB_OUTPUT
+
+  build-meshchat-package:
+    needs: calculate-version
+    uses:
+      ./.github/workflows/workflow-meshchat-package.yaml
+    with:
+      build_version: ${{ needs.calculate-version.outputs.build_version }}
+      build_dir: package/meshchat-ipkg
+
+  build-meshchat-api-package:
+    needs: calculate-version
+    uses:
+      ./.github/workflows/workflow-meshchat-api-package.yaml
+    with:
+      build_version: ${{ needs.calculate-version.outputs.build_version }}
+      build_dir: package/meshchat-ipkg

.github/workflows/release-meshchat.yaml

@@ -30,7 +30,7 @@ jobs:
   build-meshchat-package:
     needs: create-release
     uses:
-      ./.github/workflows/build-meshchat-package.yaml
+      ./.github/workflows/workflow-meshchat-package.yaml
     with:
       ref: release
       build_version: ${{ needs.create-release.outputs.build_version }}
@@ -39,7 +39,7 @@ jobs:
   build-meshchat-api-package:
     needs: create-release
     uses:
-      ./.github/workflows/build-meshchat-api-package.yaml
+      ./.github/workflows/workflow-meshchat-api-package.yaml
     with:
       build_version: ${{ needs.create-release.outputs.build_version }}
       build_dir: package/meshchat-ipkg

.github/workflows/build-meshchat-package.yaml → .github/workflows/workflow-meshchat-package.yaml

@@ -11,7 +11,7 @@ on:
       ref:
         required: false
         type: string
-        default: $GITHUB_REF_NAME
+        default: ${{ github.ref_name }}
 
 jobs:
   create-meshchat-package:

package/update-version.sh

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #!/bin/bash
 
 # This script runs from the top of the project directory and
@@ -45,25 +44,3 @@ sed -i "s/^Version:.*/Version: $version/" $IPK_DIR/CONTROL/control
 if [[ -f $IPK_DIR/www/cgi-bin/meshchatconfig.lua ]]; then
     sed -i "s/^app_version.*$/app_version                = \"${version}\"/" $IPK_DIR/www/cgi-bin/meshchatconfig.lua
 fi
-||||||| parent of 36f653c (Added beginnings of package building code)
-=======
-#!/bin/bash
-
-# This script runs from the top of the project directory and
-# updates the version number in the control file for the package
-# being built.
-
-IPK_DIR=$1
-
-if [ "$GITHUB_REF_TYPE" == 'tag' ]; then
-    # ideally should only get version tags
-    if [ ${GITHUB_REF_NAME} : "v[0-9]" ]; then
-        version="${GITHUB_REF_NAME#v}"
-    fi
-else
-    # branch gets date code
-    version=$(date +%Y%m%d)
-fi
-
-sed -i "s/^Version:.*/Version: $version/" $IPK_DIR/CONTROL/control
->>>>>>> 36f653c (Added beginnings of package building code)