diff --git a/.drone.yml b/.drone.yml index 2e4ea68..4a31ee0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -76,6 +76,7 @@ steps: - cd ./IOTContainer - zip -q -r $zip_name ./ - ls $zip_name + - du -sh $zip_name - pwd - cd ../ diff --git a/iot_upload.py b/iot_upload.py index 9b6f1f1..cc27c0c 100644 --- a/iot_upload.py +++ b/iot_upload.py @@ -38,6 +38,7 @@ def dingtalk(cdn_url,packageUrl): def obsUpload(file,uploadType): + print('开始OBS上传...') url_obsUpload = os.getenv('url_for_iotfile') + "/api/file/v1/attachment/obsUpload" myfiles = {'file': open(file, 'rb')} mydata = {'uploadType': uploadType} @@ -49,6 +50,7 @@ def obsUpload(file,uploadType): # APP管理-新增APP def platformAppAdd(package,suffix=None): + print('开始新增上传APP...') # with open(".tags") as f: version = f.read().strip() logoFile = obsUpload(file=str(os.getenv('logo')), uploadType='logo') packageFile = obsUpload(file=package,uploadType='compress') @@ -209,6 +211,8 @@ def build_the_current_windowsApp(name): if the_last_windowsApp_GITversion == None: print("初次上传,不比对zip,直接打包上传") platformAppAdd(the_current_windowsAppZIP, '.zip') + + os.system('rm -rf ' + the_current_windowsAppZIP) build_for_windowsApp() platformAppAdd('/drone/src/Sources/Setup.exe', '.exe') else: @@ -223,6 +227,7 @@ def build_the_current_windowsApp(name): os.system('cd /tmp/IOTContainer/ && zip -rq ' + os.getenv('DRONE_REPO_NAME') + '.' + os.getenv('version') + '.zip ./') diff_zip='/tmp/IOTContainer/' + os.getenv('DRONE_REPO_NAME') + '.' + os.getenv('version') + '.zip' platformAppAdd(diff_zip, '.zip') + os.system('rm -rf ' + the_current_windowsAppZIP) build_for_windowsApp() platformAppAdd('/drone/src/Sources/Setup.exe', '.exe')