From 72f1cd1da36ee9ffd38a7d662519f526ee1be0d0 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 10 May 2012 11:36:43 -0400 Subject: [PATCH 1/3] Push all architecture .debs to the packages server --- rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rakefile b/rakefile index aca55ffa8f..7e704660e7 100644 --- a/rakefile +++ b/rakefile @@ -67,5 +67,5 @@ task :package do end task :publish => :package do - sh("scp #{BUILD_DIR}/#{DEPLOY_NAME}_#{VERSION}-1_all.deb #{PACKAGE_REPO}") + sh("scp #{BUILD_DIR}/#{DEPLOY_NAME}_#{VERSION}*.deb #{PACKAGE_REPO}") end From 88da17f087c4ba6466ca6dab80a9f98e2528acc2 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 10 May 2012 11:38:32 -0400 Subject: [PATCH 2/3] Glob package names before publishing --- rakefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rakefile b/rakefile index 7e704660e7..149f227c64 100644 --- a/rakefile +++ b/rakefile @@ -67,5 +67,6 @@ task :package do end task :publish => :package do - sh("scp #{BUILD_DIR}/#{DEPLOY_NAME}_#{VERSION}*.deb #{PACKAGE_REPO}") + packages = Dir["#{BUILD_DIR}/#{DEPLOY_NAME}_#{VERSION}*.deb"] + sh("scp #{packages.join(" ")} #{PACKAGE_REPO}") end From 9c42c90412f01e9f8b2faa400261736822709303 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 10 May 2012 11:43:46 -0400 Subject: [PATCH 3/3] Move to a normalized deploy name for .deb files --- rakefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rakefile b/rakefile index 149f227c64..3398769d12 100644 --- a/rakefile +++ b/rakefile @@ -11,7 +11,7 @@ PACKAGE_NAME = "mitx" LINK_PATH = "/opt/wwc/mitx" VERSION = "0.1" COMMIT = (ENV["GIT_COMMIT"] || `git rev-parse HEAD`).chomp()[0, 10] -BRANCH = (ENV["GIT_BRANCH"] || `git symbolic-ref -q HEAD`).chomp().gsub('refs/heads/', '').gsub('origin/', '').gsub('/', '_').downcase() +BRANCH = (ENV["GIT_BRANCH"] || `git symbolic-ref -q HEAD`).chomp().gsub('refs/heads/', '').gsub('origin/', '') BUILD_NUMBER = (ENV["BUILD_NUMBER"] || "dev").chomp() if BRANCH == "master" @@ -19,9 +19,10 @@ if BRANCH == "master" else DEPLOY_NAME = "#{PACKAGE_NAME}-#{BRANCH}-#{BUILD_NUMBER}-#{COMMIT}" end -INSTALL_DIR_PATH = File.join(DEPLOY_DIR, DEPLOY_NAME) PACKAGE_REPO = "packages@gp.mitx.mit.edu:/opt/pkgrepo.incoming" +NORMALIZED_DEPLOY_NAME = DEPLOY_NAME.downcase().gsub(/[_\/]/, '-') +INSTALL_DIR_PATH = File.join(DEPLOY_DIR, NORMALIZED_DEPLOY_NAME) # Set up the clean and clobber tasks CLOBBER.include('build') @@ -58,7 +59,7 @@ task :package do "--prefix=#{INSTALL_DIR_PATH}", "-C", "#{REPO_ROOT}", "--provides=#{PACKAGE_NAME}", - "--name=#{DEPLOY_NAME}", + "--name=#{NORMALIZED_DEPLOY_NAME}", "--version=#{VERSION}", "-a", "all", "."] @@ -67,6 +68,5 @@ task :package do end task :publish => :package do - packages = Dir["#{BUILD_DIR}/#{DEPLOY_NAME}_#{VERSION}*.deb"] - sh("scp #{packages.join(" ")} #{PACKAGE_REPO}") + sh("scp #{BUILD_DIR}/#{NORMALIZED_DEPLOY_NAME}_#{VERSION}*.deb #{PACKAGE_REPO}") end