Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/linux-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
required: true
default: "v2.4.0"

permissions:
contents: write

jobs:
build-linux:
name: Build AppImage + .deb
Expand Down Expand Up @@ -38,7 +41,7 @@ jobs:
- name: Install AppImage + .deb prerequisites
run: |
sudo apt-get update -qq
sudo apt-get install -y wget fuse libfuse2 dpkg-dev
sudo apt-get install -y wget curl fuse libfuse2 dpkg-dev

- name: Build AppImage
run: |
Expand Down
2 changes: 1 addition & 1 deletion linux/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ SOURCE_DATE_EPOCH=0 bash linux/appimage/build_appimage.sh
### What the script does

1. Downloads `appimagetool` into `linux/build/cache/` (if not cached).
2. Downloads `python3.10.14-cp310-cp310-manylinux2014_x86_64.AppImage`
2. Downloads `python3.10.19-cp310-cp310-manylinux2014_x86_64.AppImage`
from the [python-appimage](https://github.com/niess/python-appimage)
project (if not cached).
3. Extracts the Python AppImage to a temporary `AppDir`.
Expand Down
9 changes: 6 additions & 3 deletions linux/appimage/build_appimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ BUILD_DIR="${REPO_ROOT}/linux/build"
CACHE_DIR="${BUILD_DIR}/cache"
APPIMAGE_DIR="${SCRIPT_DIR}"

PYTHON_VERSION="3.10.14"
PYTHON_VERSION="3.10.19"
SKIP_DOWNLOAD=0
WHEEL_PATH=""
APP_VERSION=""
Expand Down Expand Up @@ -129,8 +129,10 @@ APPIMAGETOOL="${CACHE_DIR}/appimagetool-x86_64.AppImage"

if [[ ! -f "${APPIMAGETOOL}" ]]; then
log "Downloading appimagetool..."
# Use a pinned release for CI reproducibility; fallback to the continuous build
APPIMAGETOOL_URL="https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
wget -q --show-progress -O "${APPIMAGETOOL}" "${APPIMAGETOOL_URL}"
wget -q --show-progress --tries=5 --timeout=60 --waitretry=15 -O "${APPIMAGETOOL}" "${APPIMAGETOOL_URL}" \
|| { log "Primary URL failed, retrying via curl..."; curl -fL --retry 5 --retry-delay 15 -o "${APPIMAGETOOL}" "${APPIMAGETOOL_URL}"; }
chmod +x "${APPIMAGETOOL}"
log "appimagetool downloaded to ${APPIMAGETOOL}"
else
Expand All @@ -150,7 +152,8 @@ PYTHON_APPIMAGE_URL="https://github.com/niess/python-appimage/releases/download/

if [[ ! -f "${PYTHON_APPIMAGE_CACHED}" ]] && [[ "${SKIP_DOWNLOAD}" -eq 0 ]]; then
log "Downloading Python ${PYTHON_VERSION} base AppImage..."
wget -q --show-progress -O "${PYTHON_APPIMAGE_CACHED}" "${PYTHON_APPIMAGE_URL}"
wget -q --show-progress --tries=5 --timeout=120 --waitretry=15 -O "${PYTHON_APPIMAGE_CACHED}" "${PYTHON_APPIMAGE_URL}" \
|| { log "wget failed, retrying via curl..."; curl -fL --retry 5 --retry-delay 15 -o "${PYTHON_APPIMAGE_CACHED}" "${PYTHON_APPIMAGE_URL}"; }
chmod +x "${PYTHON_APPIMAGE_CACHED}"
log "Cached at ${PYTHON_APPIMAGE_CACHED}"
elif [[ ! -f "${PYTHON_APPIMAGE_CACHED}" ]]; then
Expand Down
Loading