Skip to content

Commit 656e4b9

Browse files
authored
bump meson version and update deprecated meson calls (#153)
bump meson version and update deprecated meson calls
1 parent 8e5ff1c commit 656e4b9

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build_and_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
run: sudo apt install --no-install-recommends --yes g++-12 ninja-build
3333
- name: install meson
3434
run: |
35-
wget https://github.com/mesonbuild/meson/releases/download/1.6.1/meson-1.6.1.tar.gz && \
36-
tar -xzf meson-1.6.1.tar.gz && \
37-
mv meson-1.6.1 meson && \
35+
wget https://github.com/mesonbuild/meson/releases/download/1.4.0/meson-1.4.0.tar.gz && \
36+
tar -xzf meson-1.4.0.tar.gz && \
37+
mv meson-1.4.0 meson && \
3838
mv meson/meson.py meson/meson
3939
- name: Configure
4040
run: |

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ project('uenv', ['cpp'],
66
'warning_level=3',
77
],
88
version: files('VERSION'),
9-
meson_version: '>=1.3')
9+
meson_version: '>=1.4')
1010
version = meson.project_version()
1111

1212
oras_version = get_option('oras_version')

test/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ setup_suite = custom_target (
5353
integration_path + '/install-setup_suite.sh',
5454
'@INPUT@',
5555
'@OUTPUT@',
56-
meson.source_root(),
57-
meson.build_root(),
56+
meson.global_source_root(),
57+
meson.global_build_root(),
5858
],
5959
build_by_default: true,
6060
install: false,

0 commit comments

Comments
 (0)