Skip to content

Commit

Permalink
OM152 - Package name correction for rpms and removal of debian10 (#102)
Browse files Browse the repository at this point in the history
1. removed minor version from RPM artefact names
2. removed debian 10 support
  • Loading branch information
mphanias authored Dec 12, 2023
1 parent d7a77dd commit 9853ea9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/build_release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ jobs:
fail-fast: false
matrix:
arch: ["amd64","arm64"]
container: ["ubuntu:20.04","ubuntu:22.04","redhat:8","redhat:9","amazonlinux:2023","debian:10","debian:11","debian:12"]
exclude:
- container: "debian:10"
arch: "arm64"
container: ["ubuntu:20.04","ubuntu:22.04","redhat:8","redhat:9","amazonlinux:2023","debian:11","debian:12"]
include:
- container: "ubuntu:22.04"
name: "Ubuntu22.04"
Expand All @@ -45,9 +42,6 @@ jobs:
- container: "amazonlinux:2023"
cmd: "make rpm"
ext: "rpm"
- container: "debian:10"
cmd: "make deb"
ext: "deb"
- container: "debian:11"
cmd: "make deb"
ext: "deb"
Expand Down
5 changes: 4 additions & 1 deletion pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ fips-rpm: fipsparam rpm

.PHONY: rpm
rpm: prep
$(eval ARCH := $(shell uname -m))
$(eval DISTRO_VERSION := $(shell echo $(DISTRO_VERSION) | cut -d'.' -f1)) # Only major version for RPM

fpm --force \
--config-files /etc/aerospike-prometheus-exporter \
--input-type dir \
Expand Down Expand Up @@ -140,4 +143,4 @@ prep:
clean:
rm -rf $(TARGET_DIR)
rm -rf $(BUILD_DIR)/etc
rm -rf $(BUILD_DIR)/usr/bin
rm -rf $(BUILD_DIR)/usr/bin

0 comments on commit 9853ea9

Please sign in to comment.