Skip to content

Commit b1ed9c1

Browse files
committed
Update build, add Ubuntu 20.10, add SOVERSION
1 parent 3757de7 commit b1ed9c1

File tree

16 files changed

+133
-35
lines changed

16 files changed

+133
-35
lines changed

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Wed Jun 25 2020 Matiss Treinis <mrtreinis@gmail.com> - 1.1.1
2+
- Update build configuration, define SOVERSION. No functional changes.
3+
14
* Wed Mar 11 2020 Matiss Treinis <mrtreinis@gmail.com> - 1.1.0
25
- Logging timer no longer reports nonsense values (#1).
36
- Environment name is now available from within scripts (#2).

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
cmake_minimum_required(VERSION 3.11.4)
22

33
# IMPORTANT: updating version might require update in package dependencies at the end of this file.
4-
set(KAFE_VERSION "1.1.0")
5-
set(KAFE_VERSION_INT 10)
4+
set(KAFE_VERSION "1.1.1")
5+
set(KAFE_SOVERSION "1.1")
6+
set(KAFE_VERSION_INT 11)
67
set(KAFE_VERSION_DEP_NEXT_MAJOR "2.0.0")
78

89
project(kafe_all VERSION ${KAFE_VERSION} LANGUAGES CXX C)

DOWNLOAD.md

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### Latest stable release downloads
2-
#### Latest stable build is v1.1.0
2+
#### Latest stable build is v1.1.1
33

44
Here you can find links to latest binary packages for all supported operating systems.
55

@@ -14,6 +14,7 @@ Here you can find links to latest binary packages for all supported operating sy
1414
- [Ubuntu 18.04](#ubuntu-1804)
1515
- [Ubuntu 19.10](#ubuntu-1910)
1616
- [Ubuntu 20.04](#ubuntu-2004)
17+
- [Ubuntu 20.10](#ubuntu-2010)
1718

1819
*NOTE:* macOS is supported, but there are no binary builds available. See [README](./README.md#building-on-macos)
1920
on how to build macOS binaries from source.
@@ -26,59 +27,64 @@ including development headers.
2627

2728
#### CentOS and RHEL 7
2829

29-
- [kafe-cli-1.1.0-1.x86_64.el7.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli-1.1.0-1.x86_64.el7.rpm)
30-
- [libkafe-1.1.0-1.x86_64.el7.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe-1.1.0-1.x86_64.el7.rpm)
30+
- [kafe-cli-1.1.1-1.x86_64.el7.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli-1.1.1-1.x86_64.el7.rpm)
31+
- [libkafe-1.1.1-1.x86_64.el7.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe-1.1.1-1.x86_64.el7.rpm)
3132

3233
**IMPORTANT:** Kafe requires Lua version 5.3, a dependency not available in EL7 by default. You can either
3334
build the package yourself or use [Cheese](http://www.nosuchhost.net/~cheese/fedora/packages/epel-7/x86_64/cheese-release.html)
3435
repository to obtain compatible Lua package.
3536

3637
#### CentOS and RHEL 8
3738

38-
- [kafe-cli-1.1.0-1.x86_64.el8.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli-1.1.0-1.x86_64.el8.rpm)
39-
- [libkafe-1.1.0-1.x86_64.el8.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe-1.1.0-1.x86_64.el8.rpm)
39+
- [kafe-cli-1.1.1-1.x86_64.el8.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli-1.1.1-1.x86_64.el8.rpm)
40+
- [libkafe-1.1.1-1.x86_64.el8.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe-1.1.1-1.x86_64.el8.rpm)
4041

4142
#### Debian 9
4243

43-
- [kafe-cli_1.1.0_amd64.deb9.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli_1.1.0_amd64.deb9.deb)
44-
- [libkafe_1.1.0_amd64.deb9.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe_1.1.0_amd64.deb9.deb)
44+
- [kafe-cli_1.1.1_amd64.deb9.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli_1.1.1_amd64.deb9.deb)
45+
- [libkafe_1.1.1_amd64.deb9.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe_1.1.1_amd64.deb9.deb)
4546

4647
#### Debian 10
4748

48-
- [kafe-cli_1.1.0_amd64.deb10.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli_1.1.0_amd64.deb10.deb)
49-
- [libkafe_1.1.0_amd64.deb10.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe_1.1.0_amd64.deb10.deb)
49+
- [kafe-cli_1.1.1_amd64.deb10.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli_1.1.1_amd64.deb10.deb)
50+
- [libkafe_1.1.1_amd64.deb10.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe_1.1.1_amd64.deb10.deb)
5051

5152
#### Debian 11
5253

53-
- [kafe-cli_1.1.0_amd64.deb11.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli_1.1.0_amd64.deb11.deb)
54-
- [libkafe_1.1.0_amd64.deb11.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe_1.1.0_amd64.deb11.deb)
54+
- [kafe-cli_1.1.1_amd64.deb11.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli_1.1.1_amd64.deb11.deb)
55+
- [libkafe_1.1.1_amd64.deb11.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe_1.1.1_amd64.deb11.deb)
5556

5657
#### Fedora 31
5758

58-
- [kafe-cli-1.1.0-1.x86_64.f31.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli-1.1.0-1.x86_64.f31.rpm)
59-
- [libkafe-1.1.0-1.x86_64.f31.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe-1.1.0-1.x86_64.f31.rpm)
59+
- [kafe-cli-1.1.1-1.x86_64.f31.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli-1.1.1-1.x86_64.f31.rpm)
60+
- [libkafe-1.1.1-1.x86_64.f31.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe-1.1.1-1.x86_64.f31.rpm)
6061

6162
#### Fedora 32
6263

63-
- [kafe-cli-1.1.0-1.x86_64.f32.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli-1.1.0-1.x86_64.f32.rpm)
64-
- [libkafe-1.1.0-1.x86_64.f32.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe-1.1.0-1.x86_64.f32.rpm)
64+
- [kafe-cli-1.1.1-1.x86_64.f32.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli-1.1.1-1.x86_64.f32.rpm)
65+
- [libkafe-1.1.1-1.x86_64.f32.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe-1.1.1-1.x86_64.f32.rpm)
6566

6667
#### Fedora 33
6768

68-
- [kafe-cli-1.1.0-1.x86_64.f33.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli-1.1.0-1.x86_64.f33.rpm)
69-
- [libkafe-1.1.0-1.x86_64.f33.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe-1.1.0-1.x86_64.f33.rpm)
69+
- [kafe-cli-1.1.1-1.x86_64.f33.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli-1.1.1-1.x86_64.f33.rpm)
70+
- [libkafe-1.1.1-1.x86_64.f33.rpm](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe-1.1.1-1.x86_64.f33.rpm)
7071

7172
#### Ubuntu 18.04
7273

73-
- [kafe-cli_1.1.0_amd64.ubu1804.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli_1.1.0_amd64.ubu1804.deb)
74-
- [libkafe_1.1.0_amd64.ubu1804.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe_1.1.0_amd64.ubu1804.deb)
74+
- [kafe-cli_1.1.1_amd64.ubu1804.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli_1.1.1_amd64.ubu1804.deb)
75+
- [libkafe_1.1.1_amd64.ubu1804.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe_1.1.1_amd64.ubu1804.deb)
7576

7677
#### Ubuntu 19.10
7778

78-
- [kafe-cli_1.1.0_amd64.ubu1910.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli_1.1.0_amd64.ubu1910.deb)
79-
- [libkafe_1.1.0_amd64.ubu1910.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe_1.1.0_amd64.ubu1910.deb)
79+
- [kafe-cli_1.1.1_amd64.ubu1910.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli_1.1.1_amd64.ubu1910.deb)
80+
- [libkafe_1.1.1_amd64.ubu1910.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe_1.1.1_amd64.ubu1910.deb)
8081

8182
#### Ubuntu 20.04
8283

83-
- [kafe-cli_1.1.0_amd64.ubu2004.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/kafe-cli_1.1.0_amd64.ubu2004.deb)
84-
- [libkafe_1.1.0_amd64.ubu2004.deb](https://github.com/libkafe/kafe/releases/download/v1.1.0/libkafe_1.1.0_amd64.ubu2004.deb)
84+
- [kafe-cli_1.1.1_amd64.ubu2004.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli_1.1.1_amd64.ubu2004.deb)
85+
- [libkafe_1.1.1_amd64.ubu2004.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe_1.1.1_amd64.ubu2004.deb)
86+
87+
#### Ubuntu 20.10
88+
89+
- [kafe-cli_1.1.1_amd64.ubu2010.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/kafe-cli_1.1.1_amd64.ubu2010.deb)
90+
- [libkafe_1.1.1_amd64.ubu2010.deb](https://github.com/libkafe/kafe/releases/download/v1.1.1/libkafe_1.1.1_amd64.ubu2010.deb)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Binary builds are available for:
1111

1212
- **CentOS** and **RHEL** versions [7<sup>1</sup>](./DOWNLOAD.md#centos-and-rhel-7), [8](./DOWNLOAD.md#centos-and-rhel-8)
1313
- **Fedora** versions [31](./DOWNLOAD.md#fedora-31), [32](./DOWNLOAD.md#fedora-32), [33](./DOWNLOAD.md#fedora-33)
14-
- **Ubuntu** versions [18.04](./DOWNLOAD.md#ubuntu-1804), [19.10](./DOWNLOAD.md#ubuntu-1910), [20.04](./DOWNLOAD.md#ubuntu-2004)
14+
- **Ubuntu** versions [18.04](./DOWNLOAD.md#ubuntu-1804), [19.10](./DOWNLOAD.md#ubuntu-1910), [20.04](./DOWNLOAD.md#ubuntu-2004), [20.10](./DOWNLOAD.md#ubuntu-2010)
1515
- **Debian** versions [9](./DOWNLOAD.md#debian-9), [10](./DOWNLOAD.md#debian-10), [11](./DOWNLOAD.md#debian-11)
1616

1717
You should be able to use these binary packages for any derivative distributions.

build-dist-docker-clean.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
3+
docker rmi kafe/centos:7-build
4+
docker rmi kafe/centos:8-build
5+
docker rmi kafe/debian:9-build
6+
docker rmi kafe/debian:10-build
7+
docker rmi kafe/debian:11-build
8+
docker rmi kafe/ubuntu:1804-build
9+
docker rmi kafe/ubuntu:1910-build
10+
docker rmi kafe/ubuntu:2004-build
11+
docker rmi kafe/ubuntu:2010-build
12+
docker rmi kafe/fedora:31-build
13+
docker rmi kafe/fedora:32-build
14+
docker rmi kafe/fedora:33-build

build-dist.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,17 @@ cp build/ubuntu/2004/kafe-cli*.deb build-artifact/ubuntu-2004/
9494
cp build/ubuntu/2004/libkafe*.deb build-artifact/ubuntu-2004/
9595
for f in build-artifact/ubuntu-2004/*; do mv -v "$f" $(echo "$f" | sed "s/\.deb/\.ubu2004\.deb/"); done
9696

97+
# Ubuntu 20.10
98+
if [[ "$(docker images -q "kafe/ubuntu:2010-build" 2> /dev/null)" == "" ]]; then
99+
docker build -t kafe/ubuntu:2010-build dist/ubuntu/2010
100+
fi
101+
102+
docker run -it --rm -v `pwd`:/kafe kafe/ubuntu:2010-build
103+
mkdir -p build-artifact/ubuntu-2010/
104+
cp build/ubuntu/2010/kafe-cli*.deb build-artifact/ubuntu-2010/
105+
cp build/ubuntu/2010/libkafe*.deb build-artifact/ubuntu-2010/
106+
for f in build-artifact/ubuntu-2010/*; do mv -v "$f" $(echo "$f" | sed "s/\.deb/\.ubu2010\.deb/"); done
107+
97108
# Fedora 31
98109
if [[ "$(docker images -q "kafe/fedora:31-build" 2> /dev/null)" == "" ]]; then
99110
docker build -t kafe/fedora:31-build dist/fedora/31

dist/centos/8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN yum -y update && \
1515
libssh-devel \
1616
libgit2-devel
1717

18-
ENV CC /usr/bin/clang-8
19-
ENV CXX /usr/bin/clang++-8
18+
ENV CC /usr/bin/clang-9
19+
ENV CXX /usr/bin/clang++-9
2020

2121
CMD /kafe/dist/centos/8/build-dist.sh

dist/debian/10/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM debian:10
22

33
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
44
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
5-
DEBIAN_FRONTEND=noninteractive apt-get install -y -y \
5+
DEBIAN_FRONTEND=noninteractive apt-get install -y \
66
wget \
77
cmake \
88
build-essential \

dist/debian/11/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM debian:bullseye
22

33
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
44
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
5-
DEBIAN_FRONTEND=noninteractive apt-get install -y -y \
5+
DEBIAN_FRONTEND=noninteractive apt-get install -y \
66
wget \
77
cmake \
88
build-essential \

dist/debian/9/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM debian:9
22

33
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
44
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
5-
DEBIAN_FRONTEND=noninteractive apt-get install -y -y \
5+
DEBIAN_FRONTEND=noninteractive apt-get install -y \
66
wget \
77
build-essential \
88
clang-7 \

0 commit comments

Comments
 (0)