yacloud/tunasync-scripts
1
0
Fork 0
mirror of https://github.com/tuna/tunasync-scripts.git synced 2025-04-20 12:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

adoptium: rename from adoptopenjdk, change API endpoint

Browse Source 
the new API endpoint forbids (403) our access so a custom UA is used
This commit is contained in:
Zenithal (at bravo) 2021-09-10 21:06:13 +08:00 committed by ZenithalHourlyRate
parent 160fdceceb
commit 47cdb414d8
No known key found for this signature in database
GPG Key ID: 1189C659F3D04C1C
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
adoptopenjdk.py → adoptium.py
View File

@ -16,8 +16,8 @@ import requests
DOWNLOAD_TIMEOUT = int(os.getenv('DOWNLOAD_TIMEOUT', '1800')) DOWNLOAD_TIMEOUT = int(os.getenv('DOWNLOAD_TIMEOUT', '1800'))
BASE_PATH = os.getenv('TUNASYNC_WORKING_DIR') BASE_PATH = os.getenv('TUNASYNC_WORKING_DIR')
BASE_URL = os.getenv('TUNASYNC_UPSTREAM_URL', "http://adoptopenjdk.jfrog.io/adoptopenjdk") BASE_URL = os.getenv('TUNASYNC_UPSTREAM_URL', "https://packages.adoptium.net/artifactory")
FEATURE_VERSIONS = range(8, 18) FEATURE_VERSIONS = [8, 11, 17, 18]
def download_file(url: str, dst_file: Path)->bool: def download_file(url: str, dst_file: Path)->bool:
try: try:
@ -58,7 +58,9 @@ def check_file(dest_filename: Path, pkg_checksum: str, size: int)->bool:
return True return True
def download_release(ver: int, jvm_impl: str, alive_files: Set[str]): def download_release(ver: int, jvm_impl: str, alive_files: Set[str]):
r = requests.get(f"https://api.adoptopenjdk.net/v3/assets/latest/{ver}/{jvm_impl}", timeout=(5, 10)) r = requests.get(f"https://api.adoptium.net/v3/assets/latest/{ver}/{jvm_impl}",
timeout=(5, 10),
headers={ 'User-Agent': 'tunasync-scripts (+https://github.com/tuna/tunasync-scripts)' })
r.raise_for_status() r.raise_for_status()
rel_list = r.json() rel_list = r.json()
rel_path = Path(BASE_PATH) / str(ver) rel_path = Path(BASE_PATH) / str(ver)
@ -102,8 +104,7 @@ if __name__ == "__main__":
# =================== standalone ========================== # =================== standalone ==========================
for v in FEATURE_VERSIONS: for v in FEATURE_VERSIONS:
filelist = set() filelist = set()
for jvm in ('hotspot', 'openj9'): download_release(v, 'hotspot', filelist)
download_release(v, jvm, filelist)
delete_old_files(v, filelist) delete_old_files(v, filelist)
# =================== APT repos ========================== # =================== APT repos ==========================
# "$apt_sync" --delete "${BASE_URL}/deb" @ubuntu-lts,@debian-current main amd64,armhf,arm64 "$BASE_PATH/deb" # "$apt_sync" --delete "${BASE_URL}/deb" @ubuntu-lts,@debian-current main amd64,armhf,arm64 "$BASE_PATH/deb"
@ -118,12 +119,12 @@ if __name__ == "__main__":
check=True) check=True)
print("APT finished", flush=True) print("APT finished", flush=True)
# =================== YUM repos ========================== # =================== YUM repos ==========================
# "$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 7-8 AdoptOpenJDK x86_64,aarch64 "centos@{os_ver}-@{arch}" "$BASE_PATH/rpm" # "$yum_sync" "${BASE_URL}/rpm/centos/@{os_ver}/@{arch}" 7-8 Adopitum x86_64,aarch64 "centos@{os_ver}-@{arch}" "$BASE_PATH/rpm"
sp.run([str(here/"yum-sync.py"), sp.run([str(here/"yum-sync.py"),
BASE_URL+'/rpm/centos/@{os_ver}/@{arch}', BASE_URL+'/rpm/centos/@{os_ver}/@{arch}',
"--download-repodata", "--download-repodata",
'7-8', '7-8',
'AdoptOpenJDK', 'Adoptium',
'x86_64,aarch64', 'x86_64,aarch64',
"centos@{os_ver}-@{arch}", "centos@{os_ver}-@{arch}",
f"{BASE_PATH}/rpm" f"{BASE_PATH}/rpm"