diff --git a/.github/workflows/desktop-linux-test-pull.yml b/.github/workflows/desktop-linux-test-pull.yml index 1263a37..f831cf3 100644 --- a/.github/workflows/desktop-linux-test-pull.yml +++ b/.github/workflows/desktop-linux-test-pull.yml @@ -9,7 +9,7 @@ concurrency: jobs: test-desktop-linux: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 90 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/prod-desktop-tests-on-pull.yml b/.github/workflows/prod-desktop-tests-on-pull.yml index 3a6ea40..be9021e 100644 --- a/.github/workflows/prod-desktop-tests-on-pull.yml +++ b/.github/workflows/prod-desktop-tests-on-pull.yml @@ -7,7 +7,7 @@ on: jobs: testDesktopLinux: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 90 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/staging-desktop-tests-on-pull.yml b/.github/workflows/staging-desktop-tests-on-pull.yml index 83186ef..6195d58 100644 --- a/.github/workflows/staging-desktop-tests-on-pull.yml +++ b/.github/workflows/staging-desktop-tests-on-pull.yml @@ -7,7 +7,7 @@ on: jobs: testDesktopLinux: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 90 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/tauri-build-dev.yml b/.github/workflows/tauri-build-dev.yml index 45277f9..feb124c 100644 --- a/.github/workflows/tauri-build-dev.yml +++ b/.github/workflows/tauri-build-dev.yml @@ -8,7 +8,7 @@ jobs: create-release: permissions: contents: write - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: release_id: ${{ steps.create-release.outputs.result }} diff --git a/.github/workflows/tauri-build-prod.yml b/.github/workflows/tauri-build-prod.yml index bec6e04..d6c5a3b 100644 --- a/.github/workflows/tauri-build-prod.yml +++ b/.github/workflows/tauri-build-prod.yml @@ -8,7 +8,7 @@ jobs: create-release: permissions: contents: write - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: release_id: ${{ steps.create-release.outputs.result }} diff --git a/.github/workflows/tauri-build-staging.yml b/.github/workflows/tauri-build-staging.yml index a43117f..55cce5e 100644 --- a/.github/workflows/tauri-build-staging.yml +++ b/.github/workflows/tauri-build-staging.yml @@ -8,7 +8,7 @@ jobs: create-release: permissions: contents: write - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: release_id: ${{ steps.create-release.outputs.result }} diff --git a/.github/workflows/update-phcode-build.yml b/.github/workflows/update-phcode-build.yml index 0320ade..fe96034 100644 --- a/.github/workflows/update-phcode-build.yml +++ b/.github/workflows/update-phcode-build.yml @@ -10,7 +10,7 @@ on: jobs: build-tasks: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Event triggered by diff --git a/docs/linux/installer.sh b/docs/linux/installer.sh index 25fe48a..0a30567 100755 --- a/docs/linux/installer.sh +++ b/docs/linux/installer.sh @@ -128,11 +128,19 @@ TMP_DIR=$(mktemp -d) check_os_version() { if [ -f /etc/os-release ]; then . /etc/os-release - if [[ "$ID" = "ubuntu" && "$VERSION_ID" = "24.04" ]] || - [[ "$ID" = "linuxmint" && "$VERSION_ID" = "22" ]] || - ([[ "$ID" = "kali" ]] && [[ "$VERSION_ID" > "2024.2" ]] || [[ "$VERSION_ID" == "2024.2" ]]); then - return 0 # Ubuntu 24.04, Linux Mint 22, or Kali Linux 2024.2 or newer detected - fi + + # Define supported OS and version combinations + case "$ID:$VERSION_ID" in + ubuntu:24.04|ubuntu:24.10) # Ubuntu 24.04 or 24.10 + return 0 + ;; + linuxmint:22) # Linux Mint 22 + return 0 + ;; + kali:2024.2|kali:2024.[3-9]|kali:20[2-9][0-9].[0-9]) # Kali 2024.2 or newer + return 0 + ;; + esac fi return 1 # None of the specified versions detected }