Skip to content

Add architecture at the end of toolkit archive name #182

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.

Sign up for GitHub

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

Merged
mrgirgin merged 1 commit into from
Oct 12, 2020
Merged

Add architecture at the end of toolkit archive name #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion toolkit/scripts/toolkit.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ toolkit_component_extra_files = \
$(toolkit_root)/.gitignore

# Outputs
toolkit_archive = $(OUT_DIR)/toolkit-$(RELEASE_VERSION).tar.gz
toolkit_version = $(RELEASE_VERSION)-$(build_arch)
Copy link
Copy Markdown
Collaborator

@jslobodzian jslobodzian Oct 9, 2020

Choose a reason for hiding this comment

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

I am generally in favor of this change, but I am concernted that almost every single derivative pipeline will be impacted...as it is, we just went through and fixed quite a few of them. Please take care that the derivative pipelines can ingest this.

toolkit_archive = $(OUT_DIR)/toolkit-$(toolkit_version).tar.gz
toolkit_remove_archive = $(OUT_DIR)/toolkit-*.tar.gz
toolkit_build_dir = $(BUILD_DIR)/toolkit
toolkit_tools_dir = $(toolkit_build_dir)/tools/toolkit_bins
toolkit_release_file = $(toolkit_build_dir)/version.txt

.PHONY: package-toolkit clean-package-toolkit

Expand All @@ -32,5 +34,6 @@ package-toolkit: go-tools
cp -r $(toolkit_root)/* $(toolkit_build_dir) && \
cp $(toolkit_component_extra_files) $(toolkit_build_dir) && \
cp $(go_tool_targets) $(toolkit_tools_dir) && \
echo "$(toolkit_version)" > $(toolkit_release_file) && \
rm -rf $(toolkit_build_dir)/out && \
tar -I $(ARCHIVE_TOOL) -cvp -f $(toolkit_archive) -C $(toolkit_build_dir)/.. $(notdir $(toolkit_build_dir))