Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REL-1848 TOOLS-2729 TOOLS-2732 TOOLS-2734 TOOLS-2731 TOOLS-2730 TOOLS-2735 TOOLS-2736 #64

Merged
merged 10 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@ name: act

container:
- base:
- docker.qe.aerospike.com/build/aerospike-server:arm-centos-7
- docker.qe.aerospike.com/build/aerospike-server:arm-rhel-8
- docker.qe.aerospike.com/build/aerospike-server:arm-debian-10
- docker.qe.aerospike.com/build/aerospike-server:arm-rhel-9
- docker.qe.aerospike.com/build/aerospike-server:arm-debian-11
- docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-18.04
- docker.qe.aerospike.com/build/aerospike-server:arm-debian-12
- docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-20.04
- docker.qe.aerospike.com/build/aerospike-server:arm-ubuntu-22.04
- docker.qe.aerospike.com/build/aerospike-server:arm-amazonlinux-2023

- docker.qe.aerospike.com/build/aerospike-server:x86-centos-7
- docker.qe.aerospike.com/build/aerospike-server:x86-rhel-8
- docker.qe.aerospike.com/build/aerospike-server:x86-debian-10
- docker.qe.aerospike.com/build/aerospike-server:x86-rhel-9
- docker.qe.aerospike.com/build/aerospike-server:x86-debian-11
- docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-18.04
- docker.qe.aerospike.com/build/aerospike-server:x86-debian-12
- docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-20.04
- docker.qe.aerospike.com/build/aerospike-server:x86-ubuntu-22.04
- docker.qe.aerospike.com/build/aerospike-server:x86-amazonlinux-2023

build:
- name: default
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: Build ACT

on:
push:
branches: [ master ]
tags:
- '*'
pull_request:
branches: [ master ]
workflow_dispatch:

jobs:
buils_debian_x86_64:
Expand Down
13 changes: 13 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## New Features

* [TOOLS-2730] - (ACT) Add support for Amazon Linux 2023.
* [TOOLS-2731] - (ACT) Add support for Debian 12.
* [TOOLS-2729] - (ACT) Add support for RedHat 9.
* [TOOLS-2732] - (ACT) Add support for Ubuntu 22.04.
* [TOOLS-2739] - (ACT) Add `no-defrag-reads` configuration to suppress large block reads.

## Updates
* [TOOLS-2736] - (ACT) Removed support for Debian 10.
* [TOOLS-2734] - (ACT) Removed support for Ubuntu 18.04.
* [TOOLS-2735] - (ACT) Removed support for Centos 7.
* [TOOLS-2741] - (ACT) Remove ACT storage config item `commit-min-size`.
32 changes: 26 additions & 6 deletions build/os_version
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ main() {
*'centos'* )
distro_id='centos'
;;
*'redhat'* | *'rhel'* )
*'redhat'* | *'rhel'* | *'red hat'* )
distro_id='rhel'
;;
*'debian'* )
Expand All @@ -78,7 +78,7 @@ main() {
release=$(cat /etc/redhat-release | tr '[:upper:]' '[:lower:]')
fi
release_version=${release##*release}
distro_version=${release_version%.*}
distro_version=${release_version%%.*}
;;
'debian' )
debian_version=$(cat /etc/debian_version | tr '[:upper:]' '[:lower:]')
Expand All @@ -94,6 +94,30 @@ main() {
distro_id=${distro_id//[[:space:]]/}
distro_version=${distro_version//[[:space:]]/}

# Second chance for pre-release versions.
if [ -z "$distro_version" ]
then
case "$distro_id" in
'debian' )
debian_version=$(cat /etc/debian_version | tr '[:upper:]' '[:lower:]')
if [[ "$debian_version" = "buster"* ]]
then
debian_version=10
fi
if [[ "$debian_version" = "bullseye"* ]]
then
debian_version=11
fi
if [[ "$debian_version" = "bookworm"* ]]
then
debian_version=12
fi
distro_version=${debian_version%%.*}
mcoberly2 marked this conversation as resolved.
Show resolved Hide resolved

;;
esac
fi

case "$distro_id" in
'centos' )
distro_long="${distro_id}${distro_version%%.*}"
Expand All @@ -117,10 +141,6 @@ main() {
distro_long="centos${distro_version}"
distro_short="el${distro_version}"
;;
'amzn' )
distro_long="ami"
distro_short="ami"
;;
* )
distro_long="${distro_id}${distro_version}"
distro_short="${distro_id}${distro_version}"
Expand Down
6 changes: 3 additions & 3 deletions pkg/Makefile.deb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export CL_BASE = $(DEB_BUILD_ROOT)/opt/aerospike
export ETC_BASE = $(DEB_BUILD_ROOT)/etc/aerospike


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

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

distclean:
Expand Down
4 changes: 2 additions & 2 deletions pkg/Makefile.rpm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export ETC_BASE = $(RPM_BUILD_ROOT)/etc/aerospike

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

Expand Down