diff options
| author | supermerill <merill@free.fr> | 2022-07-14 13:48:16 +0300 |
|---|---|---|
| committer | supermerill <merill@free.fr> | 2022-07-14 13:49:34 +0300 |
| commit | f6fbcb64e6508aa7184a8b83c5d77cc286f07907 (patch) | |
| tree | 21c2cb1356b90b6ab641285b35cc12b435ab6e88 | |
| parent | e4eb3d82410a0b8fabb67127124409dada0737bd (diff) | |
fix buildlinux for 22.04
fix createrelease as the mac arm can't be compiled on github anymore
| -rwxr-xr-x | BuildLinux.sh | 6 | ||||
| -rw-r--r-- | create_release.py | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/BuildLinux.sh b/BuildLinux.sh index 5d943c8bf..78fa583df 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -74,6 +74,12 @@ then echo -e "\nFind libgtk-3, installing: libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n" apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git fi + # for ubuntu 22.04: + ubu_version="$(cat /etc/issue)" + if [[ $ubu_version == "Ubuntu 22.04"* ]] + then + apt install curl libssl-dev libcurl4-openssl-dev m4 + fi if [[ -n "$BUILD_DEBUG" ]] then echo -e "\nInstalling: libssl-dev libcurl4-openssl-dev\n" diff --git a/create_release.py b/create_release.py index 370c69d39..9efde9d94 100644 --- a/create_release.py +++ b/create_release.py @@ -68,14 +68,14 @@ with urlopen("https://api.github.com/repos/"+repo+"/actions/artifacts") as f: z = zipfile.ZipFile(io.BytesIO(resp.content)); z.extractall(release_path); os.rename(release_path+"/"+program_name+".dmg", release_path+"/"+program_name+"_"+version+"_macos_"+date_str+".dmg"); - if entry["name"] == "rc_arm_macos.dmg" and not found_macos_arm: - found_macos_arm = True; - print("ask for: "+entry["archive_download_url"]); - resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); - print("macos-arm: " +str(resp)); - z = zipfile.ZipFile(io.BytesIO(resp.content)); - z.extractall(release_path); - os.rename(release_path+"/"+program_name+".dmg", release_path+"/"+program_name+"_"+version+"_macos_arm_"+date_str+".dmg"); + # if entry["name"] == "rc_arm_macos.dmg" and not found_macos_arm: + # found_macos_arm = True; + # print("ask for: "+entry["archive_download_url"]); + # resp = requests.get(entry["archive_download_url"], headers={'Authorization': 'token ' + github_auth_token,}, allow_redirects=True); + # print("macos-arm: " +str(resp)); + # z = zipfile.ZipFile(io.BytesIO(resp.content)); + # z.extractall(release_path); + # os.rename(release_path+"/"+program_name+".dmg", release_path+"/"+program_name+"_"+version+"_macos_arm_"+date_str+".dmg"); if entry["name"] == "rc-"+program_name+"-gtk2.AppImage" and not found_linux_appimage_gtk2: found_linux_appimage_gtk2 = True; print("ask for: "+entry["archive_download_url"]); |