Skip to content

Commit 905ac23

Browse files
Merge CI workflow repair from PR #329
# Conflicts: # .github/workflows/plugin-ci-workflow.yml
2 parents cb1ce6f + c64f592 commit 905ac23

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

.github/workflows/plugin-ci-workflow.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
uses: actions/checkout@v4
4141
with:
4242
repository: Cacti/cacti
43+
ref: release/1.2.31
4344
path: cacti
4445

4546
- name: Checkout Syslog Plugin
@@ -57,7 +58,7 @@ jobs:
5758
- name: Check PHP Syntax (Lint)
5859
run: |
5960
cd cacti/plugins/syslog
60-
if find . -name '*.php' -not -path './vendor/*' -exec php -l {} 2>&1 \; | grep -iv 'no syntax errors detected'; then
61+
if find . -name '*.php' -not -path './vendor/*' -exec php -l {} \; 2>&1 | grep -iv 'no syntax errors detected'; then
6162
echo "Syntax errors found!"
6263
exit 1
6364
fi
@@ -122,6 +123,7 @@ jobs:
122123
uses: actions/checkout@v4
123124
with:
124125
repository: Cacti/cacti
126+
ref: release/1.2.31
125127
path: cacti
126128

127129
- name: Checkout Syslog Plugin
@@ -143,7 +145,7 @@ jobs:
143145
run: sudo apt-get update
144146

145147
- name: Install System Dependencies
146-
run: sudo apt-get install -y apache2 snmp snmpd rrdtool fping
148+
run: sudo apt-get install -y apache2 snmp snmpd rrdtool fping libapache2-mod-php
147149

148150
- name: Start SNMPD Agent and Test
149151
run: |
@@ -163,16 +165,15 @@ jobs:
163165
echo -e "[client]\nuser = root\npassword = cactiroot\nhost = 127.0.0.1\n" > ~/.my.cnf
164166
165167
- name: Initialize Cacti Database
166-
env:
167-
MYSQL_AUTH_USR: '--defaults-file=~/.my.cnf'
168168
run: |
169-
mysql $MYSQL_AUTH_USR -e 'CREATE DATABASE IF NOT EXISTS cacti;'
170-
mysql $MYSQL_AUTH_USR -e "CREATE USER IF NOT EXISTS 'cactiuser'@'localhost' IDENTIFIED BY 'cactiuser';"
171-
mysql $MYSQL_AUTH_USR -e "GRANT ALL PRIVILEGES ON cacti.* TO 'cactiuser'@'localhost';"
172-
mysql $MYSQL_AUTH_USR -e "GRANT SELECT ON mysql.time_zone_name TO 'cactiuser'@'localhost';"
173-
mysql $MYSQL_AUTH_USR -e "FLUSH PRIVILEGES;"
174-
mysql $MYSQL_AUTH_USR cacti < ${{ github.workspace }}/cacti/cacti.sql
175-
mysql $MYSQL_AUTH_USR -e "INSERT INTO settings (name, value) VALUES ('path_php_binary', '/usr/bin/php')" cacti
169+
MYSQL_AUTH_USR="--defaults-file=$HOME/.my.cnf"
170+
mysql "$MYSQL_AUTH_USR" -e 'CREATE DATABASE IF NOT EXISTS cacti;'
171+
mysql "$MYSQL_AUTH_USR" -e "CREATE USER IF NOT EXISTS 'cactiuser'@'localhost' IDENTIFIED BY 'cactiuser';"
172+
mysql "$MYSQL_AUTH_USR" -e "GRANT ALL PRIVILEGES ON cacti.* TO 'cactiuser'@'localhost';"
173+
mysql "$MYSQL_AUTH_USR" -e "GRANT SELECT ON mysql.time_zone_name TO 'cactiuser'@'localhost';"
174+
mysql "$MYSQL_AUTH_USR" -e "FLUSH PRIVILEGES;"
175+
mysql "$MYSQL_AUTH_USR" cacti < ${{ github.workspace }}/cacti/cacti.sql
176+
mysql "$MYSQL_AUTH_USR" -e "INSERT INTO settings (name, value) VALUES ('path_php_binary', '/usr/bin/php')" cacti
176177
177178
- name: Validate composer files
178179
run: |

0 commit comments

Comments
 (0)