Skip to content

Commit 0ecdbf5

Browse files
authored
Merge pull request #10 from mikopbx/develop
Develop
2 parents c8c7c1a + 8e7d997 commit 0ecdbf5

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- develop
78
workflow_dispatch:
89

910
jobs:
@@ -12,9 +13,9 @@ jobs:
1213
with:
1314
initial_version: "1.18"
1415
secrets:
15-
OWNCLOUD_AUTH: ${{ secrets.OWNCLOUD_AUTH }}
1616
MIKO_LIC_REST_VENDOR_ID: ${{ secrets.MIKO_LIC_REST_VENDOR_ID }}
1717
MIKO_LIC_REST_API_KEY: ${{ secrets.MIKO_LIC_REST_API_KEY }}
1818
MIKO_LIC_HOSTNAME: ${{ secrets.MIKO_LIC_HOSTNAME }}
19+
OWNCLOUD_AUTH: ${{ secrets.OWNCLOUD_AUTH }}
1920
WEBDAV_ROOT: ${{ secrets.WEBDAV_ROOT }}
2021
SHARE_API_URL: ${{ secrets.SHARE_API_URL }}

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "mikopbx/modulezabbixagent5",
33
"description": "ModuleZabbixAgent5",
44
"require": {
5-
"php": "^7.4 || ^8.0",
5+
"php": "~7.4",
6+
"ext-phalcon": "^4.0",
67
"mikopbx/core": ">=2024.1.22"
78
},
89
"autoload": {
@@ -55,7 +56,7 @@
5556
"config": {
5657
"sort-packages": true,
5758
"platform": {
58-
"php": "^7.4 || ^8.0"
59+
"php": "7.4.0"
5960
}
6061
}
6162
}

module.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,10 @@
77
"wiki_links": {
88
"ru": {"https://wiki.mikopbx.com/module-zabbix-agent5": "https://docs.mikopbx.com/mikopbx/modules/miko/module-zabbix-agent"},
99
"en": {"https://wiki.mikopbx.com/module-zabbix-agent5": "https://docs.mikopbx.com/mikopbx/v/english/modules/miko/module-zabbix-agent"}
10+
},
11+
"release_settings": {
12+
"publish_release": true,
13+
"changelog_enabled": true,
14+
"create_github_release": true
1015
}
1116
}

0 commit comments

Comments
 (0)