Skip to content

Some useful improvements for our release script #61

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
JelteF merged 7 commits into from
Apr 1, 2020
Merged

Some useful improvements for our release script #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fd4923
Make Veliogliu not the default releaser anymore
JelteF Mar 31, 2020
ae47fa3
Get debian changelog from tag, not from default branch
JelteF Mar 31, 2020
b962f8c
Pull distro branch before creating a new branch
JelteF Mar 31, 2020
72ae0c9
Include version in PR title
JelteF Mar 31, 2020
bd50e57
Add support for the Microsoft "distro"
JelteF Mar 31, 2020
759c6c4
Remove weird casing in PR title
JelteF Mar 31, 2020
c9e3eee
Fix getting git name for changelog
JelteF Apr 1, 2020
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
22 changes: 21 additions & 1 deletion automated_packaging/common_functions.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,31 @@ use JSON;

# Export subroutines
our @ISA = qw(Exporter);
our @EXPORT = qw(get_and_verify_token get_sorted_prs create_release_changelog has_backport_label);
our @EXPORT = qw(get_and_verify_token get_microsoft_email get_git_name get_sorted_prs create_release_changelog has_backport_label);

# untaint environment
local $ENV{'PATH'} = '/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin';

sub get_microsoft_email {
unless (exists $ENV{MICROSOFT_EMAIL}) {
die "You must have a MICROSOFT_EMAIL set";
}

my $microsoft_email = $ENV{MICROSOFT_EMAIL};
return $microsoft_email;
}

sub get_git_name {
my $git_name = `git config user.name`;
# Strip trailing newline
chomp $git_name;
if ($git_name eq "") {
die "You must set your git name using 'git config user.name \"Your name Here\"'";
}
return $git_name;
}


sub get_and_verify_token {
unless (exists $ENV{GITHUB_TOKEN}) {
die "You must have a GITHUB_TOKEN set";
Expand Down
19 changes: 12 additions & 7 deletions automated_packaging/update_os_package.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@

my $github_token = get_and_verify_token();

my $microsoft_email = get_microsoft_email();
my $git_name = get_git_name();

# Debian branch has it's own changelog, we can get them through the CHANGELOG file of the code repo
sub get_changelog_for_debian {

# Update project spec file
@changelog_file = `curl --user "$github_token:x-oauth-basic" -H "Accept: application/vnd.github.v3.raw" -X GET 'https://api.github.com/repos/citusdata/$github_repo_name/contents/CHANGELOG.md' 2> /dev/null`;
@changelog_file = `curl --user "$github_token:x-oauth-basic" -H "Accept: application/vnd.github.v3.raw" -X GET 'https://api.github.com/repos/citusdata/$github_repo_name/contents/CHANGELOG.md?ref=v$VERSION' 2> /dev/null`;

$first_version_has_seen = 0;
my @changelog_items;
Expand Down Expand Up @@ -56,6 +59,8 @@ sub get_changelog_for_debian {

# Checkout the distro's branch
`git checkout $DISTRO_VERSION-$PROJECT`;
# Update distro's branch
`git pull origin $DISTRO_VERSION-$PROJECT`;

# Create a new branch based on the distro's branch
`git checkout -b $DISTRO_VERSION-$PROJECT-push-$curTime`;
Expand All @@ -64,12 +69,12 @@ sub get_changelog_for_debian {
`sed -i 's/^pkglatest.*/pkglatest=$VERSION.citus-1/g' pkgvars`;

# Based on the repo, update the package related variables
if ( $DISTRO_VERSION eq "redhat" ) {
if ( $DISTRO_VERSION eq "redhat" || $DISTRO_VERSION eq "microsoft") {
`sed -i 's|^Version:.*|Version: $VERSION.citus|g' $github_repo_name.spec`;
`sed -i 's|^Source0:.*|Source0: https:\/\/github.com\/citusdata\/$github_repo_name\/archive\/v$VERSION.tar.gz|g' $github_repo_name.spec`;
`sed -i 's|^%changelog|%changelog\\n* $abbr_day[$wday] $abbr_mon[$mon] $mday $year - Burak Velioglu <velioglub\@citusdata.com> $VERSION.citus-1\\n- Update to $log_repo_name $VERSION\\n|g' $github_repo_name.spec`;
`sed -i 's|^Source0:.*|Source0: https:\/\/github.com\/citusdata\/$github_repo_name\/archive\/v$VERSION.tar.gz|g' $github_repo_name.spec`;
`sed -i 's|^%changelog|%changelog\\n* $abbr_day[$wday] $abbr_mon[$mon] $mday $year - $git_name <$microsoft_email> $VERSION.citus-1\\n- Update to $log_repo_name $VERSION\\n|g' $github_repo_name.spec`;
}
elsif ( $DISTRO_VERSION eq "debian" ) {
if ( $DISTRO_VERSION eq "debian" || $DISTRO_VERSION eq "microsoft") {
open( DEB_CLOG_FILE, "<./debian/changelog" ) || die "Debian changelog file not found";
my @lines = <DEB_CLOG_FILE>;
close(DEB_CLOG_FILE);
Expand All @@ -82,12 +87,12 @@ sub get_changelog_for_debian {
open( DEB_CLOG_FILE, ">./debian/changelog" ) || die "Debian changelog file not found";
print DEB_CLOG_FILE "$github_repo_name ($VERSION.citus-1) stable; urgency=low\n";
print DEB_CLOG_FILE @changelog_print;
print DEB_CLOG_FILE " -- Burak Velioglu <velioglub\@citusdata.com> $abbr_day[$wday], $mday $abbr_mon[$mon] $year $print_hour:$min:$sec +0000\n\n";
print DEB_CLOG_FILE " -- $git_name <$microsoft_email> $abbr_day[$wday], $mday $abbr_mon[$mon] $year $print_hour:$min:$sec +0000\n\n";
print DEB_CLOG_FILE @lines;
close(DEB_CLOG_FILE);
}

# Commit, push changes and open a pull request
`git commit -a -m "Bump $DISTRO_VERSION $log_repo_name $VERSION"`;
`git push origin $DISTRO_VERSION-$PROJECT-push-$curTime`;
`curl -g -H "Accept: application/vnd.github.v3.full+json" -X POST --user "$github_token:x-oauth-basic" -d '{\"title\":\"Bump $PROJECT $DISTRO_VERSION Version\", \"head\":\"$DISTRO_VERSION-$PROJECT-push-$curTime\", \"base\":\"$DISTRO_VERSION-$PROJECT\"}' https://api.github.com/repos/citusdata/packaging/pulls`;
`curl -g -H "Accept: application/vnd.github.v3.full+json" -X POST --user "$github_token:x-oauth-basic" -d '{\"title\":\"Bump $PROJECT $DISTRO_VERSION version to $VERSION\", \"head\":\"$DISTRO_VERSION-$PROJECT-push-$curTime\", \"base\":\"$DISTRO_VERSION-$PROJECT\"}' https://api.github.com/repos/citusdata/packaging/pulls`;