From 0cd0d5a65e29f992dd132b9e98de6f16cd551a8f Mon Sep 17 00:00:00 2001 From: r-caamano Date: Wed, 7 Aug 2024 19:58:13 +0000 Subject: [PATCH] modified ci workflow to only trigger on push to branches other than main --- .github/workflows/ci.yml | 7 +++++-- CHANGELOG.md | 4 ++++ src/zfw.c | 2 +- src/zfw_monitor.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5734d9e..f280b70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,11 @@ --- name: release -on: [push] - +on: + push: + branches: + - '*' + - '!main' env: APP_NAME: 'zfw' diff --git a/CHANGELOG.md b/CHANGELOG.md index c8b90be..159bf00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format --- ### +# [0.8.12] - 2024-08-07 +- Change ci workflow display name and to trigger on puch to branches other than main. +- +### # [0.8.11] - 2024-08-03 - Edit Readme updated ```zfw -L -E ``` outputs diff --git a/src/zfw.c b/src/zfw.c index a751e4f..7d371cb 100644 --- a/src/zfw.c +++ b/src/zfw.c @@ -236,7 +236,7 @@ char *direction_string; char *masq_interface; char check_alt[IF_NAMESIZE]; -const char *argp_program_version = "0.8.11"; +const char *argp_program_version = "0.8.12"; struct ring_buffer *ring_buffer; __u32 if_list[MAX_IF_LIST_ENTRIES]; diff --git a/src/zfw_monitor.c b/src/zfw_monitor.c index 627599c..4ce59e7 100644 --- a/src/zfw_monitor.c +++ b/src/zfw_monitor.c @@ -78,7 +78,7 @@ char check_alt[IF_NAMESIZE]; char doc[] = "zfw_monitor -- ebpf firewall monitor tool"; const char *rb_map_path = "/sys/fs/bpf/tc/globals/rb_map"; const char *tproxy_map_path = "/sys/fs/bpf/tc/globals/zt_tproxy_map"; -const char *argp_program_version = "0.8.11"; +const char *argp_program_version = "0.8.12"; union bpf_attr rb_map; int rb_fd = -1;