From 0f44dd53c7c754c4040c13ea8ba6528731dbb0f3 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Thu, 22 Feb 2024 00:54:00 +0000 Subject: [PATCH 1/3] Start 1.9.x branch after 1.9.0 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e2eb05a..5910d1fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,8 @@ cmake_minimum_required(VERSION 3.13) project(ZNC VERSION 1.9.0 LANGUAGES CXX) -set(ZNC_VERSION 1.9.0) -set(append_git_version false) +set(ZNC_VERSION 1.9.x) +set(append_git_version true) set(alpha_version "") # e.g. "-rc1" set(VERSION_EXTRA "" CACHE STRING "Additional string appended to version, e.g. to mark distribution") From 5d7aa0f7d44cb0d686881ced5b409c3d0569e7ca Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Thu, 22 Feb 2024 01:09:29 +0000 Subject: [PATCH 2/3] Update docker submodule --- docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker b/docker index 95e45def..8638ba43 160000 --- a/docker +++ b/docker @@ -1 +1 @@ -Subproject commit 95e45def730df4a04c0d08a97dccb66e5b9766f6 +Subproject commit 8638ba43acaef4bff2d4d39668c1992f411230a6 From 814cebeeed4b9f10bfdd73f59034efbe26308db6 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Thu, 22 Feb 2024 01:10:33 +0000 Subject: [PATCH 3/3] Update git docker alpine to 3.19 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index daa10120..c1443ce6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine:3.18 +FROM alpine:3.19 ARG VERSION_EXTRA="" -ARG CMAKEFLAGS="-DVERSION_EXTRA=${VERSION_EXTRA} -DCMAKE_INSTALL_PREFIX=/opt/znc -DWANT_CYRUS=YES -DWANT_PERL=YES -DWANT_PYTHON=YES" +ARG CMAKEFLAGS="-DVERSION_EXTRA=${VERSION_EXTRA} -DCMAKE_INSTALL_PREFIX=/opt/znc -DWANT_CYRUS=YES -DWANT_PERL=YES -DWANT_PYTHON=YES -DWANT_ARGON=YES" ARG MAKEFLAGS="" LABEL org.label-schema.schema-version="1.0"