Browse Source

try to use same file version as host

Signed-off-by: falkTX <falktx@falktx.com>
pull/28/head
falkTX 1 year ago
parent
commit
4abf7b5fa7
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 22 additions and 17 deletions
  1. +15
    -16
      .github/workflows/bootstrap.yml
  2. +7
    -1
      setup/versions.sh

+ 15
- 16
.github/workflows/bootstrap.yml View File

@@ -681,22 +681,21 @@ jobs:
matrix:
include:
# ubuntu:20.04
# FIXME Cannot use the installed version of file (5.38) to cross-compile file 5.34
#- target: linux-aarch64
#container: ubuntu:20.04
#os: ubuntu-latest
#- target: linux-armhf
#container: ubuntu:20.04
#os: ubuntu-latest
#- target: linux-i686
#container: ubuntu:20.04
#os: ubuntu-latest
#- target: linux-riscv64
#container: ubuntu:20.04
#os: ubuntu-latest
#- target: linux-x86_64
#container: ubuntu:20.04
#os: ubuntu-latest
- target: linux-aarch64
container: ubuntu:20.04
os: ubuntu-latest
- target: linux-armhf
container: ubuntu:20.04
os: ubuntu-latest
- target: linux-i686
container: ubuntu:20.04
os: ubuntu-latest
- target: linux-riscv64
container: ubuntu:20.04
os: ubuntu-latest
- target: linux-x86_64
container: ubuntu:20.04
os: ubuntu-latest
- target: macos-universal-10.15
os: macos-11
- target: wasm


+ 7
- 1
setup/versions.sh View File

@@ -147,9 +147,15 @@ QT5_URL=https://download.qt.io/new_archive/qt/${QT5_MVERSION}/${QT5_VERSION}/sub
# ---------------------------------------------------------------------------------------------------------------------
# bootstrap carla stuff

FILE_VERSION=5.34
FILE_URL=ftp://ftp.astron.com/pub/file

# try to use same version as host
if [ "${LINUX}" -eq 1 ] && [ -e /usr/bin/file ]; then
FILE_VERSION=$(/usr/bin/file -v | awk 'sub("file-","")')
else
FILE_VERSION=5.34
fi

if [ "${LINUX}" -eq 1 ] || [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
CXFREEZE_VERSION=a59a0f6c476554c1a789de2a9f6f77329d6a6dd1 # 6.8.4
PYTHON_VERSION=3.9.5


Loading…
Cancel
Save