Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade Meson to 1.2.3 #3991

Merged
merged 1 commit into from
Nov 21, 2023
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
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ install:
- ps: $env:DIST_FOLDER = "rizin-$env:builder-$env:RZ_VERSION"
- ps: $env:ARTIFACT_ZIP = "$env:DIST_FOLDER.zip"
# Download required packages
- cmd: if defined BUILD_DIR ( %PYTHON%\python.exe -m pip install meson ninja PyYAML)
- cmd: if defined BUILD_DIR ( %PYTHON%\python.exe -m pip install meson==1.2.3 ninja PyYAML)

# Build scripts
build_script:
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ jobs:
run: sudo apt-get --assume-yes install python3-wheel python3-setuptools libcapstone4 libcapstone-dev
- name: Install meson and ninja
if: matrix.build_system == 'meson' && matrix.enabled
run: pip3 install --user meson ninja PyYAML
run: pip3 install --user meson==1.2.3 ninja PyYAML
- name: Checkout rzpipe
if: matrix.enabled
uses: actions/checkout@v3
Expand Down Expand Up @@ -447,7 +447,7 @@ jobs:
- name: Install python and other dependencies
run: sudo apt-get install --yes python3-wheel python3-setuptools python3-pip
- name: Install meson and ninja
run: sudo pip3 install meson ninja PyYAML
run: sudo pip3 install meson==1.2.3 ninja PyYAML
- name: Install test dependencies
run: |
sudo pip3 install 'git+https://github.com/rizinorg/rz-pipe#egg=rzpipe&subdirectory=python'
Expand Down Expand Up @@ -499,7 +499,7 @@ jobs:
timeout-minutes: 45
steps:
- name: Install meson and ninja
run: sudo pip3 install meson ninja
run: sudo pip3 install meson==1.2.3 ninja
- name: Checkout rizin
run: |
git clone https://github.com/${{ github.repository }}
Expand Down Expand Up @@ -583,10 +583,8 @@ jobs:
steps:
- name: Install python and other dependencies
run: sudo apt-get --assume-yes install python3-wheel python3-setuptools python3-pip
- name: Download meson from git (temporary)
run: pip3 install --user git+https://github.com/mesonbuild/meson
- name: Install meson and ninja
run: pip3 install --user ninja PyYAML
run: pip3 install --user meson==1.2.3 ninja PyYAML
- uses: actions/checkout@v3
- name: Extract rizin version
run: echo "version=$(python sys/version.py)" >> $GITHUB_OUTPUT
Expand All @@ -613,7 +611,7 @@ jobs:
- name: Install python and other dependencies
run: sudo apt-get --assume-yes install python3-wheel python3-setuptools python3-pip
- name: Install meson and ninja
run: sudo pip3 install meson ninja PyYAML
run: sudo pip3 install meson==1.2.3 ninja PyYAML
- uses: actions/download-artifact@v3
with:
name: rizin-src.tar.xz
Expand Down Expand Up @@ -652,7 +650,7 @@ jobs:
- name: Install pkg-config with Homebrew
run: brew install pkg-config
- name: Install meson and ninja
run: pip3 install meson ninja PyYAML
run: pip3 install meson==1.2.3 ninja PyYAML
- name: Install ImageMagick
run: brew install imagemagick
- name: Create OSX package
Expand Down Expand Up @@ -722,7 +720,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt-get --assume-yes install pax wget unzip python3-wheel python3-setuptools python3-pip && pip3 install --user meson ninja
run: sudo apt-get --assume-yes install pax wget unzip python3-wheel python3-setuptools python3-pip && pip3 install --user meson==1.2.3 ninja
- name: Compile with meson
run: |
export PATH=${HOME}/.local/bin:${PATH}
Expand All @@ -749,7 +747,7 @@ jobs:
- name: Install dependencies
run: sudo apt-get --assume-yes install pax wget unzip python3-wheel python3-setuptools python3-pip
- name: Install meson and ninja
run: sudo pip3 install meson ninja PyYAML
run: sudo pip3 install meson==1.2.3 ninja PyYAML
- name: Compile & Install Rizin
run: |
export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}
Expand All @@ -775,7 +773,7 @@ jobs:
- name: Install dependencies
run: sudo apt-get --assume-yes install pax wget unzip python3-wheel python3-setuptools python3-pip
- name: Install meson and ninja
run: sudo pip3 install meson ninja PyYAML
run: sudo pip3 install meson==1.2.3 ninja PyYAML
- name: Compile & Install Rizin
run: |
export PATH=${HOME}/bin:${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/Library/Python/3.11/bin:${HOME}/.local/bin:${PATH}
Expand Down Expand Up @@ -805,7 +803,7 @@ jobs:
mkdir rizin && pwd && ls -l
tar -C rizin --strip-components=1 -xvf rizin-src.tar.xz
- name: Install dependencies
run: sudo apt-get --assume-yes install wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson ninja
run: sudo apt-get --assume-yes install wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson==1.2.3 ninja
- name: Install rizin
run: |
export PATH=$PATH:/usr/local/bin
Expand Down Expand Up @@ -834,7 +832,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt-get --assume-yes install cmake swig pkg-config clang libclang-dev llvm wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson ninja
sudo apt-get --assume-yes install cmake swig pkg-config clang libclang-dev llvm wget unzip python3-wheel python3-setuptools build-essential python3-pip && sudo pip3 install meson==1.2.3 ninja
- name: Install rizin
run: |
export PATH=$PATH:/usr/local/bin
Expand Down Expand Up @@ -1006,7 +1004,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: sudo apt-get --assume-yes install python3-wheel python3-setuptools python3-pip && pip3 install --user meson
run: sudo apt-get --assume-yes install python3-wheel python3-setuptools python3-pip && pip3 install --user meson==1.2.3
- name: Download subprojects
run: |
export PATH=${HOME}/.local/bin:${PATH}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Install meson and ninja
run: |
sudo pip3 install meson ninja PyYAML
sudo pip3 install meson==1.2.3 ninja PyYAML
export PATH=${HOME}/Library/Python/3.9/bin:${HOME}/Library/Python/3.10/bin:${HOME}/.local/bin:${PATH}

- name: Initialize CodeQL - cpp
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ cache:
script:
- export PR_NAME=$(echo $TRAVIS_PULL_REQUEST_SLUG | cut -d'/' -f1)
- |
pip3 install -U --user meson ninja
pip3 install -U --user meson==1.2.3 ninja
pip3 install --user 'git+https://github.com/rizinorg/rz-pipe#egg=rzpipe&subdirectory=python'
$SHELL travis-script
Loading