diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 366844ee12..41438469df 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -26,10 +26,6 @@ jobs: strategy: fail-fast: false matrix: - container: [ "sandervocke/shoopdaloop_build_base_debian_bullseye_x86_64:latest" ] - container_options: [ "--user root --workdir /" ] - arch: [ x86_64 ] - manylinux_arch: [ x86_64 ] kind: - name: linux_release build_type: 'Release' @@ -48,6 +44,10 @@ jobs: build_type: 'Debug' cmake_opts: '"ENABLE_COVERAGE" = "On"' coverage: true + container: [ "sandervocke/shoopdaloop_build_base_debian_bullseye_x86_64:latest" ] + container_options: [ "--user root --workdir /" ] + arch: [ x86_64 ] + manylinux_arch: [ x86_64 ] runs-on: ubuntu-latest container: image: ${{ matrix.container }} @@ -73,7 +73,6 @@ jobs: python: python3.9 rename_wheel_sed: "'s/([^\\.]+)[\\.]+whl/\\1.whl/g'" # remove double dot pyinstaller: ${{ matrix.kind.pyinstaller }} - pyinstaller_python: /usr/bin/python3.9 # pyinstaller uses the official AlmaLinux Python because it has shared libs package_kind: ${{ matrix.kind.package_kind }} coverage: ${{ matrix.kind.coverage }} # - name: Setup tmate session @@ -216,7 +215,6 @@ jobs: python: python3.9 rename_wheel_sed: "'s/([^\\.]+)[\\.]+whl/\\1.whl/g'" # remove double dot pyinstaller: ${{ matrix.kind.pyinstaller }} - pyinstaller_python: /usr/bin/python3.9 # pyinstaller uses the official AlmaLinux Python because it has shared libs package_kind: ${{ matrix.kind.package_kind }} coverage: ${{ matrix.kind.coverage }} @@ -316,7 +314,6 @@ jobs: python: python3.9 pyinstaller: ${{ matrix.kind.pyinstaller }} appbundle: ${{ matrix.kind.appbundle }} - pyinstaller_python: ${{ matrix.kind.pyinstaller_python }} package_kind: ${{ matrix.kind.package_kind }} coverage: ${{ matrix.kind.coverage }} # Note: for some reason, an incorrect MacOS identifier is generated (macos_11 instead of macos_11_0). @@ -467,7 +464,6 @@ jobs: python: ${{ matrix.kind.python }} rename_wheel_sed: ${{ matrix.kind.rename_wheel_sed }} pyinstaller: ${{ matrix.kind.pyinstaller }} - pyinstaller_python: ${{ matrix.kind.pyinstaller_python }} package_kind: ${{ matrix.kind.package_kind }} coverage: ${{ matrix.kind.coverage }} diff --git a/distribution/dependencies/build_base_debian_bullseye b/distribution/dependencies/build_base_debian_bullseye index f2a073196a..f901d9ef3f 100644 --- a/distribution/dependencies/build_base_debian_bullseye +++ b/distribution/dependencies/build_base_debian_bullseye @@ -8,6 +8,7 @@ cmake/bullseye-backports ninja-build pkgconf lcov +ruby # libraries libglib2.0-0 diff --git a/distribution/dockerfiles/build_base_debian_bullseye.Dockerfile b/distribution/dockerfiles/build_base_debian_bullseye.Dockerfile index 3b8685f7ae..601a2136cb 100644 --- a/distribution/dockerfiles/build_base_debian_bullseye.Dockerfile +++ b/distribution/dockerfiles/build_base_debian_bullseye.Dockerfile @@ -9,4 +9,5 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \ DEBIAN_FRONTEND=noninteractive apt-add-repository -y "deb http://deb.debian.org/debian bullseye-backports main contrib non-free" && \ DEBIAN_FRONTEND=noninteractive apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install $(dependencies/get_dependencies.sh build_base_debian_bullseye) \ No newline at end of file + DEBIAN_FRONTEND=noninteractive apt-get -y install $(dependencies/get_dependencies.sh build_base_debian_bullseye) && \ + gem install fpm \ No newline at end of file