Do not force a specific version of meson.

We were forcing a spcefic version has a workaround to meson issue.
We don't need now, and recent version is needed to compile on armhf.
This commit is contained in:
Matthieu Gautier 2022-03-11 11:50:44 +01:00
parent 64ea01e445
commit 32f1bfdab3
7 changed files with 11 additions and 11 deletions

View File

@ -30,7 +30,7 @@ RUN apt update -q \
# vim less grep \ # vim less grep \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \ && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
&& pip3 install meson==0.52.1 pytest gcovr requests distro && pip3 install meson pytest gcovr requests distro
# Create user # Create user
RUN useradd --create-home runner RUN useradd --create-home runner

View File

@ -19,7 +19,7 @@ RUN dnf install -y --nodocs \
&& dnf remove -y "*-doc" \ && dnf remove -y "*-doc" \
&& dnf autoremove -y \ && dnf autoremove -y \
&& dnf clean all \ && dnf clean all \
&& pip3 install meson==0.52.1 pytest requests distro && pip3 install meson pytest requests distro
# Create user # Create user
RUN useradd --create-home runner RUN useradd --create-home runner

View File

@ -25,7 +25,7 @@ RUN apt update -q \
# vim less grep \ # vim less grep \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \ && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
&& pip3 install meson==0.52.1 pytest gcovr requests distro && pip3 install meson pytest gcovr requests distro
# Create user # Create user
RUN useradd --create-home runner RUN useradd --create-home runner

View File

@ -21,7 +21,7 @@ RUN apt update -q \
# vim less grep \ # vim less grep \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \ && rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* \
&& pip3 install meson==0.52.1 pytest 'markupsafe<2.0.0' 'jinja2<3.0.0' 'gcovr<5.0' requests distro && pip3 install meson pytest 'markupsafe<2.0.0' 'jinja2<3.0.0' 'gcovr<5.0' requests distro
# Create user # Create user
RUN useradd --create-home runner RUN useradd --create-home runner

View File

@ -6,7 +6,7 @@ on:
- cron: '0 1 * * *' - cron: '0 1 * * *'
env: env:
DOCKER_VERSION: 31 DOCKER_VERSION: 32
jobs: jobs:
Docker: Docker:
@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: Docker needs: Docker
container: container:
image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31" image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-32"
options: "--device /dev/fuse --privileged" options: "--device /dev/fuse --privileged"
steps: steps:
- name: Checkout code - name: Checkout code
@ -182,7 +182,7 @@ jobs:
brew install pkg-config ninja automake autoconf brew install pkg-config ninja automake autoconf
- name: Install python modules - name: Install python modules
run: | run: |
pip3 install meson==0.52.1 pytest requests distro pip3 install meson pytest requests distro
pip3 install --no-deps $GITHUB_WORKSPACE pip3 install --no-deps $GITHUB_WORKSPACE
- name: secret - name: secret
shell: bash shell: bash

View File

@ -8,7 +8,7 @@ on:
- cron: '0 1 * * *' - cron: '0 1 * * *'
env: env:
DOCKER_VERSION: 31 DOCKER_VERSION: 32
jobs: jobs:
Docker: Docker:
@ -75,7 +75,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: Docker needs: Docker
container: container:
image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31" image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-32"
options: "--device /dev/fuse --privileged" options: "--device /dev/fuse --privileged"
steps: steps:
- name: Checkout code - name: Checkout code
@ -187,7 +187,7 @@ jobs:
brew install pkg-config ninja automake autoconf brew install pkg-config ninja automake autoconf
- name: Install python modules - name: Install python modules
run: | run: |
pip3 install meson==0.52.1 pytest requests distro pip3 install meson pytest requests distro
pip3 install --no-deps $GITHUB_WORKSPACE pip3 install --no-deps $GITHUB_WORKSPACE
- name: secret - name: secret
shell: bash shell: bash

View File

@ -35,7 +35,7 @@ setup(
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'meson==0.52.1', 'meson',
'distro' 'distro'
], ],
entry_points={ entry_points={