Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

moving datetimestamping responsiblities from mach package

Browse source 
to CI upload, swaps semicolons for dashes
This commit is contained in:
Jake Goldsborough 2016-11-03 23:02:12 -07:00
parent 2390503772
commit d302cf23bc
2 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
etc/ci/upload_nightly.sh
View file

@ -16,10 +16,11 @@ usage() {
upload() { upload() {
local package_filename local nightly_filename nightly_timestamp
package_filename="$(basename "${2}")" nightly_timestamp="$(date -u +"%Y-%m-%dT%H-%M-%SZ")"
nightly_filename="${nightly_timestamp}-$(basename "${2}")"
local -r nightly_upload_dir="s3://servo-builds/nightly/${1}" local -r nightly_upload_dir="s3://servo-builds/nightly/${1}"
local -r package_upload_path="${nightly_upload_dir}/${package_filename}" local -r package_upload_path="${nightly_upload_dir}/${nightly_filename}"
s3cmd --mime-type="application/octet-stream" \ s3cmd --mime-type="application/octet-stream" \
put "${2}" "${package_upload_path}" put "${2}" "${package_upload_path}"
s3cmd cp "${package_upload_path}" "${nightly_upload_dir}/servo-latest.${3}" s3cmd cp "${package_upload_path}" "${nightly_upload_dir}/servo-latest.${3}"

12
python/servo/package_commands.py
View file

@ -19,7 +19,6 @@ import subprocess
import mako.template import mako.template
from mach.registrar import Registrar from mach.registrar import Registrar
from datetime import datetime
from mach.decorators import ( from mach.decorators import (
CommandArgument, CommandArgument,
@ -155,7 +154,6 @@ class PackageCommands(CommandBase):
dir_to_build = '/'.join(binary_path.split('/')[:-1]) dir_to_build = '/'.join(binary_path.split('/')[:-1])
dir_to_root = '/'.join(binary_path.split('/')[:-3]) dir_to_root = '/'.join(binary_path.split('/')[:-3])
now = datetime.utcnow()
print("Creating Servo.app") print("Creating Servo.app")
dir_to_dmg = '/'.join(binary_path.split('/')[:-2]) + '/dmg' dir_to_dmg = '/'.join(binary_path.split('/')[:-2]) + '/dmg'
@ -212,9 +210,7 @@ class PackageCommands(CommandBase):
print("Creating dmg") print("Creating dmg")
os.symlink('/Applications', dir_to_dmg + '/Applications') os.symlink('/Applications', dir_to_dmg + '/Applications')
dmg_path = '/'.join(dir_to_build.split('/')[:-1]) + '/' dmg_path = '/'.join(dir_to_build.split('/')[:-1]) + '/'
time = now.replace(microsecond=0).isoformat() dmg_path += "servo-tech-demo.dmg"
time = time.replace(':', '-')
dmg_path += time + "-servo-tech-demo.dmg"
try: try:
subprocess.check_call(['hdiutil', 'create', '-volname', 'Servo', dmg_path, '-srcfolder', dir_to_dmg]) subprocess.check_call(['hdiutil', 'create', '-volname', 'Servo', dmg_path, '-srcfolder', dir_to_dmg])
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
@ -229,7 +225,7 @@ class PackageCommands(CommandBase):
dir_to_tar = '/'.join(dir_to_build.split('/')[:-1]) + '/brew/' dir_to_tar = '/'.join(dir_to_build.split('/')[:-1]) + '/brew/'
if not path.exists(dir_to_tar): if not path.exists(dir_to_tar):
os.makedirs(dir_to_tar) os.makedirs(dir_to_tar)
tar_path = dir_to_tar + now.strftime("servo-%Y-%m-%d.tar.gz") tar_path = dir_to_tar + "servo.tar.gz"
if path.exists(dir_to_brew): if path.exists(dir_to_brew):
print("Cleaning up from previous packaging") print("Cleaning up from previous packaging")
delete(dir_to_brew) delete(dir_to_brew)
@ -316,9 +312,7 @@ class PackageCommands(CommandBase):
os.close(runservo) os.close(runservo)
print("Creating tarball") print("Creating tarball")
time = datetime.utcnow().replace(microsecond=0).isoformat() tar_path = path.join(self.get_target_dir(), 'servo-tech-demo.tar.gz')
time = time.replace(':', "-")
tar_path = path.join(self.get_target_dir(), time + '-servo-tech-demo.tar.gz')
archive_deterministically(dir_to_temp, tar_path, prepend_path='servo/') archive_deterministically(dir_to_temp, tar_path, prepend_path='servo/')