From c53ea5d8f0b2c57fcbc03ed0e0d04c55ad1ef35f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 16 Jan 2023 02:42:01 -0500 Subject: [PATCH] chore: drop rpm support --- Dockerfile | 2 +- Makefile | 31 +------------------------------ 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5210c1..d52825e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.19.5-buster # hadolint ignore=DL3027 RUN apt-get update \ - && apt install apt-transport-https build-essential curl gnupg2 jq lintian rpm rsync rubygems-integration ruby-dev ruby -qy \ + && apt install apt-transport-https build-essential curl gnupg2 jq lintian rsync rubygems-integration ruby-dev ruby -qy \ && git clone https://github.com/bats-core/bats-core.git /tmp/bats-core \ && /tmp/bats-core/install.sh /usr/local \ && apt-get clean \ diff --git a/Makefile b/Makefile index f652f65..f65705f 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,6 @@ build: prebuild @$(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb @$(MAKE) build/deb/$(NAME)_$(VERSION)_arm64.deb @$(MAKE) build/deb/$(NAME)_$(VERSION)_armhf.deb - @$(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build-docker-image: docker build --rm -q -f Dockerfile -t $(IMAGE_NAME):build . @@ -156,27 +155,6 @@ build/deb/$(NAME)_$(VERSION)_armhf.deb: build/linux/$(NAME)-armhf build/linux/$(NAME)-armhf=/usr/bin/$(NAME) \ LICENSE=/usr/share/doc/$(NAME)/copyright -build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm: build/linux/$(NAME)-amd64 - export SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct) \ - && mkdir -p build/rpm \ - && fpm \ - --architecture x86_64 \ - --category utils \ - --description "$$PACKAGE_DESCRIPTION" \ - --input-type dir \ - --license 'MIT License' \ - --maintainer "$(MAINTAINER_NAME) <$(EMAIL)>" \ - --name $(NAME) \ - --output-type rpm \ - --package build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm \ - --rpm-os linux \ - --url "https://github.com/$(MAINTAINER)/$(REPOSITORY)" \ - --vendor "" \ - --version $(VERSION) \ - --verbose \ - build/linux/$(NAME)-amd64=/usr/bin/$(NAME) \ - LICENSE=/usr/share/doc/$(NAME)/copyright - clean: rm -rf build release validation @@ -208,13 +186,11 @@ release: build bin/gh-release bin/gh-release-body cp build/deb/$(NAME)_$(VERSION)_amd64.deb release/$(NAME)_$(VERSION)_amd64.deb cp build/deb/$(NAME)_$(VERSION)_arm64.deb release/$(NAME)_$(VERSION)_arm64.deb cp build/deb/$(NAME)_$(VERSION)_armhf.deb release/$(NAME)_$(VERSION)_armhf.deb - cp build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm release/$(NAME)-$(VERSION)-1.x86_64.rpm bin/gh-release create $(MAINTAINER)/$(REPOSITORY) $(VERSION) $(shell git rev-parse --abbrev-ref HEAD) bin/gh-release-body $(MAINTAINER)/$(REPOSITORY) v$(VERSION) release-packagecloud: @$(MAKE) release-packagecloud-deb - @$(MAKE) release-packagecloud-rpm release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAME)_$(VERSION)_arm64.deb build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_amd64.deb @@ -231,9 +207,6 @@ release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb build/deb/$(NAM package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/buster build/deb/$(NAME)_$(VERSION)_armhf.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/raspbian/bullseye build/deb/$(NAME)_$(VERSION)_armhf.deb -release-packagecloud-rpm: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm - package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7 build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm - validate: mkdir -p validation lintian build/deb/$(NAME)_$(VERSION)_amd64.deb || true @@ -248,12 +221,10 @@ validate: cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_amd64.deb cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_arm64.deb cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_armhf.deb - cd validation && rpm2cpio ../build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm > $(NAME)-$(VERSION)-1.x86_64.cpio - ls -lah build/deb build/rpm validation + ls -lah build/deb validation sha1sum build/deb/$(NAME)_$(VERSION)_amd64.deb sha1sum build/deb/$(NAME)_$(VERSION)_arm64.deb sha1sum build/deb/$(NAME)_$(VERSION)_armhf.deb - sha1sum build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm cd /home/runner/work/$(REPOSITORY)/$(REPOSITORY) && bats test.bats prebuild: