Skip to content

Commit 253cebd

Browse files
Merge pull request #203 from AikidoSec/arm-build-revamp
v1.0.120 and re-enabled ARM build
2 parents 8401e48 + e730161 commit 253cebd

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
image: ubuntu:22.04
1717
strategy:
1818
matrix:
19-
os: [ ubuntu-24.04 ]
19+
os: [ ubuntu-24.04, ubuntu-24.04-arm ]
2020
fail-fast: false
2121

2222
steps:
@@ -96,7 +96,7 @@ jobs:
9696
strategy:
9797
matrix:
9898
php_version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
99-
os: [ ubuntu-24.04 ]
99+
os: [ ubuntu-24.04, ubuntu-24.04-arm ]
100100
fail-fast: false
101101

102102
steps:
@@ -166,7 +166,7 @@ jobs:
166166
image: quay.io/centos/centos:stream9
167167
strategy:
168168
matrix:
169-
os: ['ubuntu-24.04']
169+
os: ['ubuntu-24.04', 'ubuntu-24.04-arm']
170170
fail-fast: false
171171
needs: [ build_libs, build_php_extension ]
172172
steps:
@@ -260,7 +260,7 @@ jobs:
260260
image: ubuntu:22.04
261261
strategy:
262262
matrix:
263-
os: [ ubuntu-24.04 ]
263+
os: [ ubuntu-24.04, ubuntu-24.04-arm ]
264264
fail-fast: false
265265
needs: [ build_rpm ]
266266
steps:
@@ -331,7 +331,7 @@ jobs:
331331
matrix:
332332
php_version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
333333
server: ['nginx-php-fpm', 'apache-mod-php', 'php-built-in']
334-
os: ['ubuntu-24.04']
334+
os: ['ubuntu-24.04', 'ubuntu-24.04-arm']
335335
fail-fast: false
336336
steps:
337337
- name: Checkout repository
@@ -401,7 +401,7 @@ jobs:
401401
strategy:
402402
matrix:
403403
container: ['ubuntu:24.04']
404-
os: ['ubuntu-24.04']
404+
os: ['ubuntu-24.04', 'ubuntu-24.04-arm']
405405
php_version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
406406
server: ['nginx-php-fpm', 'apache-mod-php', 'php-built-in']
407407
fail-fast: false

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,25 @@ Prerequisites:
3838

3939
##### x86_64
4040
```
41-
rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.0.119/aikido-php-firewall.x86_64.rpm
41+
rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.0.120/aikido-php-firewall.x86_64.rpm
4242
```
4343

4444
##### arm64 / aarch64
4545
```
46-
rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.0.119/aikido-php-firewall.aarch64.rpm
46+
rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.0.120/aikido-php-firewall.aarch64.rpm
4747
```
4848

4949
#### For Debian-based Systems (Debian, Ubuntu)
5050

5151
##### x86_64
5252
```
53-
curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.0.119/aikido-php-firewall.x86_64.deb
53+
curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.0.120/aikido-php-firewall.x86_64.deb
5454
dpkg -i -E ./aikido-php-firewall.x86_64.deb
5555
```
5656

5757
##### arm64 / aarch64
5858
```
59-
curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.0.119/aikido-php-firewall.aarch64.deb
59+
curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.0.120/aikido-php-firewall.aarch64.deb
6060
dpkg -i -E ./aikido-php-firewall.aarch64.deb
6161
```
6262

docs/aws-elastic-beanstalk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
```
55
commands:
66
aikido-php-firewall:
7-
command: "rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.0.119/aikido-php-firewall.x86_64.rpm"
7+
command: "rpm -Uvh --oldpackage https://github.com/AikidoSec/firewall-php/releases/download/v1.0.120/aikido-php-firewall.x86_64.rpm"
88
ignoreErrors: true
99
1010
files:

docs/fly-io.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Create a script to install the Aikido PHP Firewall during deployment:
3232
#!/usr/bin/env bash
3333
cd /tmp
3434

35-
curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.0.119/aikido-php-firewall.x86_64.deb
35+
curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.0.120/aikido-php-firewall.x86_64.deb
3636
dpkg -i -E ./aikido-php-firewall.x86_64.deb
3737
```
3838

docs/laravel-forge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cd /tmp
2121
2222
# Install commands from the "Manual install" section below, based on your OS
2323
24-
curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.0.119/aikido-php-firewall.x86_64.deb
24+
curl -L -O https://github.com/AikidoSec/firewall-php/releases/download/v1.0.120/aikido-php-firewall.x86_64.deb
2525
dpkg -i -E ./aikido-php-firewall.x86_64.deb
2626
2727
# Restarting the php services in order to load the Aikido PHP Firewall

lib/agent/globals/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package globals
22

33
const (
4-
Version = "1.0.119"
4+
Version = "1.0.120"
55
ConfigUpdatedAtMethod = "GET"
66
ConfigUpdatedAtAPI = "/config"
77
ConfigAPIMethod = "GET"

lib/php-extension/include/php_aikido.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
extern zend_module_entry aikido_module_entry;
44
#define phpext_aikido_ptr &aikido_module_entry
55

6-
#define PHP_AIKIDO_VERSION "1.0.119"
6+
#define PHP_AIKIDO_VERSION "1.0.120"
77

88
#if defined(ZTS) && defined(COMPILE_DL_AIKIDO)
99
ZEND_TSRMLS_CACHE_EXTERN()

lib/request-processor/globals/globals.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ var CloudConfigMutex sync.Mutex
1414
var MiddlewareInstalled bool
1515

1616
const (
17-
Version = "1.0.119"
17+
Version = "1.0.120"
1818
)

package/rpm/aikido.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: aikido-php-firewall
2-
Version: 1.0.119
2+
Version: 1.0.120
33
Release: 1
44
Summary: Aikido PHP Extension
55
License: GPL

0 commit comments

Comments
 (0)