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

[CLI-3329] Removed unused files and code #2978

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
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
12 changes: 0 additions & 12 deletions .aptly.conf

This file was deleted.

2 changes: 0 additions & 2 deletions .dockerignore

This file was deleted.

11 changes: 1 addition & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,7 @@ else
TAGS=$(TAGS) CC=$(CC) CXX=$(CXX) CGO_LDFLAGS=$(CGO_LDFLAGS) goreleaser build --clean --single-target --snapshot
endif

include ./mk-files/semver.mk
include ./mk-files/docs.mk
include ./mk-files/dry-run.mk
include ./mk-files/release.mk
include ./mk-files/release-test.mk

S3_DEB_RPM_BUCKET_NAME=confluent-cli-release
S3_DEB_RPM_PROD_PREFIX=confluent-cli
S3_DEB_RPM_PROD_PATH=s3://$(S3_DEB_RPM_BUCKET_NAME)/$(S3_DEB_RPM_PROD_PREFIX)
S3_DEB_RPM_STAG_PATH=s3://$(S3_DEB_RPM_BUCKET_NAME)/confluent-cli-staging

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't delete these spaces, because doing so generates a messier diff for standard_build_layout.patch.


.PHONY: clean
clean:
Expand Down
6 changes: 0 additions & 6 deletions confluent-cli.repo

This file was deleted.

15 changes: 3 additions & 12 deletions debian/patches/standard_build_layout.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- cli/Makefile 2024-09-26 10:12:52.818827565 -0700
+++ debian/Makefile 2024-09-11 13:09:21.649421504 -0700
@@ -1,139 +1,163 @@
--- cli/Makefile 2024-12-19 19:02:36.720106824 -0800
+++ debian/Makefile 2024-12-11 16:40:02.936381349 -0800
@@ -1,130 +1,163 @@
-SHELL := /bin/bash
-GORELEASER_VERSION := v1.21.2
+SHELL=/bin/bash
Expand Down Expand Up @@ -63,11 +63,6 @@
+ VERSION=$(CLI_VERSION)
endif

-include ./mk-files/semver.mk
-include ./mk-files/docs.mk
-include ./mk-files/dry-run.mk
-include ./mk-files/release.mk
-include ./mk-files/release-test.mk
+export PACKAGE_TITLE=cli
+export FULL_PACKAGE_TITLE=confluent-$(PACKAGE_TITLE)
+export PACKAGE_NAME=$(FULL_PACKAGE_TITLE)-$(VERSION)
Expand Down Expand Up @@ -147,10 +142,6 @@
+ curl -fs https://$${baseurl}/confluent-cli/binaries/$(CLI_VERSION)/confluent$${version}_windows_amd64.exe -o $${filepath}; \
+ chmod 755 $${filepath}

-S3_DEB_RPM_BUCKET_NAME=confluent-cli-release
-S3_DEB_RPM_PROD_PREFIX=confluent-cli
-S3_DEB_RPM_PROD_PATH=s3://$(S3_DEB_RPM_BUCKET_NAME)/$(S3_DEB_RPM_PROD_PREFIX)
-S3_DEB_RPM_STAG_PATH=s3://$(S3_DEB_RPM_BUCKET_NAME)/confluent-cli-staging
+ cp LICENSE $(DESTDIR)$(DOCPATH)/COPYRIGHT
+ $(DESTDIR)$(BINPATH)/confluent --version | awk -F' ' '{ print $3 }' > $(DESTDIR)$(DOCPATH)/version.txt

Expand Down
61 changes: 0 additions & 61 deletions docker/Dockerfile_linux_repos

This file was deleted.

4 changes: 0 additions & 4 deletions docker/Dockerfile_linux_repos_base

This file was deleted.

114 changes: 0 additions & 114 deletions mk-files/docs.mk

This file was deleted.

3 changes: 0 additions & 3 deletions mk-files/dry-run.mk

This file was deleted.

14 changes: 0 additions & 14 deletions mk-files/release-test.mk

This file was deleted.

67 changes: 0 additions & 67 deletions mk-files/release.mk

This file was deleted.

15 changes: 0 additions & 15 deletions mk-files/semver.mk

This file was deleted.

33 changes: 0 additions & 33 deletions scripts/build_linux.sh

This file was deleted.

Loading