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.

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

Fixed incorrectly named RPMs #11029

Merged
merged 10 commits into from
Mar 10, 2022
Merged

Fixed incorrectly named RPMs #11029

Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
31ebcbc
Attempted fix of RPM naming issue
fheinecke Mar 10, 2022
e4da1ef
Another try
fheinecke Mar 10, 2022
a19c0c1
Reverted makefile version
fheinecke Mar 10, 2022
3c34a78
Reverted makefile back to branch/v9 version
fheinecke Mar 10, 2022
790cdb8
Actually fixed makefile to branch/v9
fheinecke Mar 10, 2022
de9933a
Apply suggestions from code review
fheinecke Mar 10, 2022
fdf3ceb
Merge branch 'branch/v9' into fred/rpm-naming-fix
r0mant Mar 10, 2022
0b1c664
Merge branch 'branch/v9' into fred/rpm-naming-fix
r0mant Mar 10, 2022
5ef38be
Merge branch 'branch/v9' into fred/rpm-naming-fix
r0mant Mar 10, 2022
6f68750
Merge branch 'branch/v9' into fred/rpm-naming-fix
fheinecke Mar 10, 2022
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
6 changes: 3 additions & 3 deletions build.assets/build-package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ fi

# amd64 RPMs should use CentOS 7 compatible artifacts
if [[ "${PACKAGE_TYPE}" == "rpm" && "${ARCH}" == "x86_64" ]]; then
OPTIONAL_RUNTIME_SECTION+="-centos7"
OPTIONAL_TARBALL_SECTION+="-centos7"
fi

# set optional runtime section for filename
Expand All @@ -204,7 +204,7 @@ fi

# set variables appropriately depending on type of package being built
if [[ "${TELEPORT_TYPE}" == "ent" ]]; then
TARBALL_FILENAME="teleport-ent-v${TELEPORT_VERSION}-${PLATFORM}-${FILENAME_ARCH}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz"
TARBALL_FILENAME="teleport-ent-v${TELEPORT_VERSION}-${PLATFORM}-${FILENAME_ARCH}${OPTIONAL_TARBALL_SECTION}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz"
URL="${DOWNLOAD_ROOT}/${TARBALL_FILENAME}"
TAR_PATH="teleport-ent"
RPM_NAME="teleport-ent"
Expand All @@ -215,7 +215,7 @@ if [[ "${TELEPORT_TYPE}" == "ent" ]]; then
TYPE_DESCRIPTION="[${TEXT_ARCH} Enterprise edition]"
fi
else
TARBALL_FILENAME="teleport-v${TELEPORT_VERSION}-${PLATFORM}-${FILENAME_ARCH}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz"
TARBALL_FILENAME="teleport-v${TELEPORT_VERSION}-${PLATFORM}-${FILENAME_ARCH}${OPTIONAL_TARBALL_SECTION}${OPTIONAL_RUNTIME_SECTION}-bin.tar.gz"
URL="${DOWNLOAD_ROOT}/${TARBALL_FILENAME}"
TAR_PATH="teleport"
RPM_NAME="teleport"
Expand Down