diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93f05d88..e7a0d48d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,13 +53,13 @@ jobs: -DCMAKE_BUILD_TYPE=Release -DDISABLE_UT=ON make -j4 - - name: Create package + - name: Create neuron package env: ARCH: ${{ matrix.arch[5] }} run: | ./package.sh -p ${ARCH} -n neuron-2.${GITHUB_REF##*/} cd package - python3 create_deb.py 2.${GITHUB_REF##*/} ${{ matrix.arch[5] }} + python3 create_neuron_deb.py 2.${GITHUB_REF##*/} ${{ matrix.arch[5] }} sudo alien --scripts -k -r *.deb mv *.rpm neuron-2.${GITHUB_REF##*/}-${{ matrix.arch[5] }}.rpm mv *.rpm ../ @@ -73,15 +73,23 @@ jobs: *.deb *.rpm - - name: Create sdk package + - name: Create neuron sdk package run: | ./package-sdk.sh -p ${{ matrix.arch[5] }} -n neuron-sdk-2.${GITHUB_REF##*/} + cd package + python3 create_neuron_sdk_deb.py 2.${GITHUB_REF##*/} ${{ matrix.arch[5] }} + sudo alien --scripts -k -r *.deb + mv *.rpm neuron-sdk-2.${GITHUB_REF##*/}-${{ matrix.arch[5] }}.rpm + mv *.rpm ../ + mv *.deb ../ - uses: actions/upload-artifact@v3 with: name: neuron-sdk-${{ matrix.arch[5] }} path: | neuron-sdk-*.tar.gz + neuron-sdk-*.deb + neuron-sdk-*.rpm ut: runs-on: ubuntu-20.04 @@ -199,11 +207,6 @@ jobs: arch: [arm64, arm, amd64] type: [neuron, neuron-sdk] package: [tar.gz, deb, rpm] - exclude: - - type: neuron-sdk - package: deb - - type: neuron-sdk - package: rpm steps: - uses: actions/download-artifact@v2 diff --git a/package/create_deb.py b/package/create_neuron_deb.py similarity index 76% rename from package/create_deb.py rename to package/create_neuron_deb.py index 8d262cf0..a35a67a6 100755 --- a/package/create_deb.py +++ b/package/create_neuron_deb.py @@ -4,10 +4,11 @@ import sys rules = [] -rules.append(mkdeb.FileMap("deb/conffiles", "/DEBIAN/", "r", "conffiles")) -rules.append(mkdeb.FileMap("deb/postinst", "/DEBIAN/", "r", "postinst")) -rules.append(mkdeb.FileMap("deb/preinst", "/DEBIAN/", "r", "preinst")) -rules.append(mkdeb.FileMap("deb/prerm", "/DEBIAN/", "r", "prerm")) +rules.append(mkdeb.FileMap("deb/neuron/conffiles", + "/DEBIAN/", "r", "conffiles")) +rules.append(mkdeb.FileMap("deb/neuron/postinst", "/DEBIAN/", "r", "postinst")) +rules.append(mkdeb.FileMap("deb/neuron/preinst", "/DEBIAN/", "r", "preinst")) +rules.append(mkdeb.FileMap("deb/neuron/prerm", "/DEBIAN/", "r", "prerm")) rules.append(mkdeb.FileMap("../build/neuron", "/opt/neuron/bin/", "x")) rules.append(mkdeb.FileMap("../private_test.key", "/opt/neuron/bin/")) diff --git a/package/create_neuron_sdk_deb.py b/package/create_neuron_sdk_deb.py new file mode 100755 index 00000000..04db49f3 --- /dev/null +++ b/package/create_neuron_sdk_deb.py @@ -0,0 +1,110 @@ +import mkdeb +import os +import sys + +rules = [] + +rules.append(mkdeb.FileMap("deb/sdk/conffiles", "/DEBIAN/", "r", "conffiles")) +rules.append(mkdeb.FileMap("deb/sdk/postinst", "/DEBIAN/", "r", "postinst")) +rules.append(mkdeb.FileMap("deb/sdk/preinst", "/DEBIAN/", "r", "preinst")) +rules.append(mkdeb.FileMap("deb/sdk/prerm", "/DEBIAN/", "r", "prerm")) + +rules.append(mkdeb.FileMap("../cmake/neuron-config.cmake", + "/usr/local/lib/cmake/neuron/")) +rules.append(mkdeb.FileMap("../build/libneuron-base.so", "/usr/local/lib/")) + +rules.append(mkdeb.FileMap("../include/connection/mqtt_client_intf.h", + "/usr/local/include/neuron/connection/")) +rules.append(mkdeb.FileMap("../include/connection/neu_connection.h", + "/usr/local/include/neuron/connection/")) +rules.append(mkdeb.FileMap("../include/connection/neu_tcp.h", + "/usr/local/include/neuron/connection/")) +rules.append(mkdeb.FileMap("../include/event/event.h", + "/usr/local/include/neuron/event/")) + +rules.append(mkdeb.FileMap("../include/json/json.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_error.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_group_config.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_fn.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_log.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_login.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_logout.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_mqtt.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_node.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_param.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_plugin.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_rw.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_tag.h", + "/usr/local/include/neuron/json/")) +rules.append(mkdeb.FileMap("../include/json/neu_json_tty.h", + "/usr/local/include/neuron/json/")) + +rules.append(mkdeb.FileMap("../include/functions.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/hash_table.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/idhash.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/mem_alloc.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_adapter.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_atomic_data.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_base64.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_data_expr.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_datatag_table.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_errcodes.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_file.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_license.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_list.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_log.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_panic.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_plugin_info.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_plugin.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_subscribe.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_tag_group_config.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_tag.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_types.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_uuid.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neu_vector.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/neuron.h", + "/usr/local/include/neuron/")) +rules.append(mkdeb.FileMap("../include/vector.h", + "/usr/local/include/neuron/")) + +mkdeb.create_deb_file(rules) +mkdeb.create_control("neuron-sdk", sys.argv[1], sys.argv[2], "neuron-sdk", "") + +cmd = 'dpkg-deb -b tmp/ ' + 'neuron-sdk' + '-' + \ + sys.argv[1] + '-'+sys.argv[2] + ".deb" +os.system(cmd) diff --git a/package/deb/conffiles b/package/deb/neuron/conffiles similarity index 100% rename from package/deb/conffiles rename to package/deb/neuron/conffiles diff --git a/package/deb/postinst b/package/deb/neuron/postinst similarity index 100% rename from package/deb/postinst rename to package/deb/neuron/postinst diff --git a/package/deb/preinst b/package/deb/neuron/preinst similarity index 100% rename from package/deb/preinst rename to package/deb/neuron/preinst diff --git a/package/deb/prerm b/package/deb/neuron/prerm similarity index 100% rename from package/deb/prerm rename to package/deb/neuron/prerm diff --git a/package/deb/sdk/conffiles b/package/deb/sdk/conffiles new file mode 100644 index 00000000..e69de29b diff --git a/package/deb/sdk/postinst b/package/deb/sdk/postinst new file mode 100755 index 00000000..b71e059e --- /dev/null +++ b/package/deb/sdk/postinst @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "postinst" \ No newline at end of file diff --git a/package/deb/sdk/preinst b/package/deb/sdk/preinst new file mode 100755 index 00000000..63af47f4 --- /dev/null +++ b/package/deb/sdk/preinst @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "preinst" \ No newline at end of file diff --git a/package/deb/sdk/prerm b/package/deb/sdk/prerm new file mode 100755 index 00000000..384267e1 --- /dev/null +++ b/package/deb/sdk/prerm @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "prerm" \ No newline at end of file diff --git a/version b/version new file mode 100644 index 00000000..952cca7e --- /dev/null +++ b/version @@ -0,0 +1 @@ +2.0.0-beta.1 \ No newline at end of file