Skip to content

Commit 0d17c39

Browse files
REL-1848 TOOLS-2729 TOOLS-2732 TOOLS-2734 TOOLS-2731 TOOLS-2730 TOOLS-2735 TOOLS-2736 (#64)
* Add amzn2023, debian12, ubuntu22.04, el9, and remove centos7, debian10, ubuntu18.04. * Update RELEASE.md * REL-1848 Update RELEASE.md * To properly handle amazon 2023. * Use xz compression format. * REV should come from version.h * Disable auto build trigger action. * Correct naming for deb package. * Update RELEASE.md * Update build/os_version --------- Co-authored-by: Michael C. Coberly <[email protected]>
1 parent 531f692 commit 0d17c39

File tree

6 files changed

+53
-23
lines changed

6 files changed

+53
-23
lines changed

.build.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ name: act
22

33
container:
44
- base:
5-
- docker.qe.aerospike.com/build/aerospike-server:arm-centos-7
65
- docker.qe.aerospike.com/build/aerospike-server:arm-rhel-8
7-
- docker.qe.aerospike.com/build/aerospike-server:arm-debian-10
6+
- docker.qe.aerospike.com/build/aerospike-server:arm-rhel-9
87
- docker.qe.aerospike.com/build/aerospike-server:arm-debian-11
9-
- docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-18.04
8+
- docker.qe.aerospike.com/build/aerospike-server:arm-debian-12
109
- docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-20.04
10+
- docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-22.04
11+
- docker.qe.aerospike.com/build/aerospike-server:arm-amazonlinux-2023
1112

12-
- docker.qe.aerospike.com/build/aerospike-server:x86-centos-7
1313
- docker.qe.aerospike.com/build/aerospike-server:x86-rhel-8
14-
- docker.qe.aerospike.com/build/aerospike-server:x86-debian-10
14+
- docker.qe.aerospike.com/build/aerospike-server:x86-rhel-9
1515
- docker.qe.aerospike.com/build/aerospike-server:x86-debian-11
16-
- docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-18.04
16+
- docker.qe.aerospike.com/build/aerospike-server:x86-debian-12
1717
- docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-20.04
18+
- docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-22.04
19+
- docker.qe.aerospike.com/build/aerospike-server:x86-amazonlinux-2023
1820

1921
build:
2022
- name: default

.github/workflows/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
name: Build ACT
22

33
on:
4-
push:
5-
branches: [ master ]
6-
tags:
7-
- '*'
8-
pull_request:
9-
branches: [ master ]
4+
workflow_dispatch:
105

116
jobs:
127
buils_debian_x86_64:

RELEASE.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## New Features
2+
3+
* [TOOLS-2730] - (ACT) Add support for Amazon Linux 2023.
4+
* [TOOLS-2731] - (ACT) Add support for Debian 12.
5+
* [TOOLS-2729] - (ACT) Add support for RedHat 9.
6+
* [TOOLS-2732] - (ACT) Add support for Ubuntu 22.04.
7+
* [TOOLS-2739] - (ACT) Add `no-defrag-reads` configuration to suppress large block reads.
8+
9+
## Updates
10+
* [TOOLS-2736] - (ACT) Removed support for Debian 10.
11+
* [TOOLS-2734] - (ACT) Removed support for Ubuntu 18.04.
12+
* [TOOLS-2735] - (ACT) Removed support for Centos 7.
13+
* [TOOLS-2741] - (ACT) Remove ACT storage config item `commit-min-size`.

build/os_version

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ main() {
5757
*'centos'* )
5858
distro_id='centos'
5959
;;
60-
*'redhat'* | *'rhel'* )
60+
*'redhat'* | *'rhel'* | *'red hat'* )
6161
distro_id='rhel'
6262
;;
6363
*'debian'* )
@@ -78,7 +78,7 @@ main() {
7878
release=$(cat /etc/redhat-release | tr '[:upper:]' '[:lower:]')
7979
fi
8080
release_version=${release##*release}
81-
distro_version=${release_version%.*}
81+
distro_version=${release_version%%.*}
8282
;;
8383
'debian' )
8484
debian_version=$(cat /etc/debian_version | tr '[:upper:]' '[:lower:]')
@@ -94,6 +94,30 @@ main() {
9494
distro_id=${distro_id//[[:space:]]/}
9595
distro_version=${distro_version//[[:space:]]/}
9696

97+
# Second chance for pre-release versions.
98+
if [ -z "$distro_version" ]
99+
then
100+
case "$distro_id" in
101+
'debian' )
102+
debian_version=$(cat /etc/debian_version | tr '[:upper:]' '[:lower:]')
103+
if [[ "$debian_version" = "buster"* ]]
104+
then
105+
debian_version=10
106+
fi
107+
if [[ "$debian_version" = "bullseye"* ]]
108+
then
109+
debian_version=11
110+
fi
111+
if [[ "$debian_version" = "bookworm"* ]]
112+
then
113+
debian_version=12
114+
fi
115+
distro_version=${debian_version%%.*}
116+
117+
;;
118+
esac
119+
fi
120+
97121
case "$distro_id" in
98122
'centos' )
99123
distro_long="${distro_id}${distro_version%%.*}"
@@ -117,10 +141,6 @@ main() {
117141
distro_long="centos${distro_version}"
118142
distro_short="el${distro_version}"
119143
;;
120-
'amzn' )
121-
distro_long="ami"
122-
distro_short="ami"
123-
;;
124144
* )
125145
distro_long="${distro_id}${distro_version}"
126146
distro_short="${distro_id}${distro_version}"

pkg/Makefile.deb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export CL_BASE = $(DEB_BUILD_ROOT)/opt/aerospike
66
export ETC_BASE = $(DEB_BUILD_ROOT)/etc/aerospike
77

88

9-
#REV = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi)
109
DIR_PKG = target/packages
11-
REV = $(shell build/version)
10+
REV = $(shell grep VERSION src/common/version.h | tr -s ' ' | cut -d' ' -f3 | tr -d '"')
11+
BLD_ID = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi)
1212
OS = $(shell build/os_version)
1313
ARCH=$(shell uname -m)
1414
MANIFEST_DIR = manifest/TEMP
@@ -58,7 +58,7 @@ dist:
5858

5959
sed 's/@VERSION@/'$(REV)'/g' <pkg/deb/control >$(DEB_BUILD_ROOT)/DEBIAN/control
6060
sed -i 's/@ARCH@/'$(ARCH)'/g' $(DEB_BUILD_ROOT)/DEBIAN/control
61-
fakeroot dpkg-deb --build $(DEB_BUILD_ROOT) $(DIR_PKG)/act_$(REV)-1$(OS)_$(ARCH).deb
61+
fakeroot dpkg-deb -Z xz --build $(DEB_BUILD_ROOT) $(DIR_PKG)/act_$(REV)-1$(OS)_$(ARCH).deb
6262
rm -rf dist
6363

6464
distclean:

pkg/Makefile.rpm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export ETC_BASE = $(RPM_BUILD_ROOT)/etc/aerospike
77

88
MANIFEST_DIR = manifest/TEMP
99
DIR_PKG = target/packages
10-
#REV = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi)
11-
REV = $(shell build/version)
10+
REV = $(shell grep VERSION src/common/version.h | tr -s ' ' | cut -d' ' -f3 | tr -d '"')
11+
BLD_ID = $(shell git describe 2>/dev/null; if [ $${?} != 0 ]; then echo 'unknown'; fi)
1212
OS = $(shell build/os_version)
1313
ARCH=$(shell uname -m)
1414

0 commit comments

Comments
 (0)