update release script to avoid collision with nightly

This commit is contained in:
remi durand 2021-06-04 13:57:01 +02:00
parent aaefb49967
commit 1ba0aa0db6
4 changed files with 9 additions and 9 deletions

View File

@ -92,10 +92,10 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: nightly_macos.tar name: rc_macos.tar
path: build/Slic3r.tar path: build/Slic3r.tar
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: nightly_macos.dmg name: rc_macos.dmg
path: build/Slic3r.dmg path: build/Slic3r.dmg

View File

@ -73,7 +73,7 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: nightly_linux.tar name: rc_linux.tar
path: build/Slic3r.tar path: build/Slic3r.tar
- name: build appimage - name: build appimage
working-directory: ./build/package working-directory: ./build/package
@ -86,6 +86,6 @@ jobs:
- name: Upload appimage - name: Upload appimage
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: Slic3r-AppImage.tar name: rc-Slic3r-AppImage.tar
path: build/package/Slic3r_ubu64.AppImage.tar path: build/package/Slic3r_ubu64.AppImage.tar

View File

@ -108,5 +108,5 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v1.0.0 uses: actions/upload-artifact@v1.0.0
with: with:
name: nightly_win64 name: rc_win64
path: build/package/ path: build/package/

View File

@ -46,7 +46,7 @@ with urlopen("https://api.github.com/repos/"+repo+"/actions/artifacts") as f:
found_macos = False; found_macos = False;
print("there is "+ str(artifacts["total_count"])+ " artifacts in the repo"); print("there is "+ str(artifacts["total_count"])+ " artifacts in the repo");
for entry in artifacts["artifacts"]: for entry in artifacts["artifacts"]:
if entry["name"] == "nightly_win64" and not found_win: if entry["name"] == "rc_win64" and not found_win:
found_win = True; found_win = True;
print("ask for: "+entry["archive_download_url"]); print("ask for: "+entry["archive_download_url"]);
resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True);
@ -58,7 +58,7 @@ with urlopen("https://api.github.com/repos/"+repo+"/actions/artifacts") as f:
ret = subprocess.check_output([path_7zip, "a", "-tzip", base_name+".zip", base_name]); ret = subprocess.check_output([path_7zip, "a", "-tzip", base_name+".zip", base_name]);
except: except:
print("Failed to zip the win directory, do it yourself"); print("Failed to zip the win directory, do it yourself");
if entry["name"] == "nightly_macos.dmg" and not found_macos: if entry["name"] == "rc_macos.dmg" and not found_macos:
found_macos = True; found_macos = True;
print("ask for: "+entry["archive_download_url"]); print("ask for: "+entry["archive_download_url"]);
resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True);
@ -66,7 +66,7 @@ with urlopen("https://api.github.com/repos/"+repo+"/actions/artifacts") as f:
z = zipfile.ZipFile(io.BytesIO(resp.content)); z = zipfile.ZipFile(io.BytesIO(resp.content));
z.extractall(release_path); z.extractall(release_path);
os.rename(release_path+"/"+program_name+".dmg", release_path+"/"+program_name+"_"+version+"_macos_"+date_str+".dmg"); os.rename(release_path+"/"+program_name+".dmg", release_path+"/"+program_name+"_"+version+"_macos_"+date_str+".dmg");
if entry["name"] == program_name+"-AppImage.tar" and not found_linux_appimage: if entry["name"] == "rc-"+program_name+"-AppImage.tar" and not found_linux_appimage:
found_linux_appimage = True; found_linux_appimage = True;
print("ask for: "+entry["archive_download_url"]); print("ask for: "+entry["archive_download_url"]);
resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True);
@ -77,7 +77,7 @@ with urlopen("https://api.github.com/repos/"+repo+"/actions/artifacts") as f:
my_tar.extractall(release_path); my_tar.extractall(release_path);
my_tar.close(); my_tar.close();
os.rename(release_path+"/"+program_name+"_ubu64.AppImage", release_path+"/"+program_name+"-ubuntu_18.04-" + version + ".AppImage"); os.rename(release_path+"/"+program_name+"_ubu64.AppImage", release_path+"/"+program_name+"-ubuntu_18.04-" + version + ".AppImage");
if entry["name"] == "nightly_linux.tar" and not found_linux: if entry["name"] == "rc_linux.tar" and not found_linux:
found_linux = True; found_linux = True;
print("ask for: "+entry["archive_download_url"]); print("ask for: "+entry["archive_download_url"]);
resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True);