Skip to content

Commit a0a677f

Browse files
ilg-ulilg-ul
committed
tests/package.json bump deps
1 parent a57e22e commit a0a677f

File tree

1 file changed

+126
-39
lines changed

1 file changed

+126
-39
lines changed

‎tests/package.json‎

Lines changed: 126 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"liquidjs": "^10.20.1"
2424
},
2525
"xpack": {
26-
"minimumXpmRequired": "0.21.0",
26+
"minimumXpmRequired": "0.21.4",
2727
"dependencies": {},
2828
"$devDependenciesUrls": [
2929
"https://github.com/micro-os-plus",
@@ -55,17 +55,93 @@
5555
"commandMesonBuildVerbose": "meson compile -C {{ properties.buildFolderRelativePathPosix }} --verbose",
5656
"commandMesonClean": "meson compile -C {{ properties.buildFolderRelativePathPosix }} --clean",
5757
"commandMesonPerformTests": "meson test -C {{ properties.buildFolderRelativePathPosix }} --verbose",
58-
"configs-ci-non-darwin": "native-cmake-gcc",
59-
"configs-ci": "native-cmake-clang,native-meson-clang,qemu-cortex-m0-cmake-gcc,qemu-cortex-m7f-cmake-gcc,qemu-riscv-rv32imac-cmake-gcc,qemu-cortex-m0-meson-gcc",
60-
"configs-selected-non-darwin": "native-cmake-gcc,native-meson-gcc",
61-
"configs-selected": "native-cmake-clang, native-meson-clang,qemu-cortex-m0-cmake-gcc,qemu-cortex-m0-meson-gcc,qemu-cortex-m4f-cmake-gcc,qemu-cortex-m4f-meson-gcc,qemu-riscv-rv32imac-cmake-gcc,qemu-riscv-rv32imac-meson-gcc",
62-
"configs-latest-non-darwin": "native-cmake-gcc,native-meson-gcc",
63-
"configs-latest": "native-cmake-clang,native-meson-clang,qemu-cortex-m0-cmake-gcc,qemu-cortex-m0-meson-gcc,qemu-cortex-m3-cmake-gcc,qemu-cortex-m3-meson-gcc,qemu-cortex-m4f-cmake-gcc,qemu-cortex-m4f-meson-gcc,qemu-cortex-m7f-cmake-gcc,qemu-cortex-m7f-meson-gcc,qemu-riscv-rv32imac-cmake-gcc,qemu-riscv-rv32imac-meson-gcc,qemu-riscv-rv64imafdc-cmake-gcc,qemu-riscv-rv64imafdc-meson-gcc",
64-
"build-types": "debug,release",
65-
"test-actions": "prepare,build,test",
66-
"actions-install-for-configs": "{% assign build-types = properties.build-types | split: ',' %}{% for config in configs %}{% for build-type in build-types %}xpm install --config {{ config }}-{{ build-type }}{{ os.EOL }}{% endfor %}{% endfor %}",
67-
"actions-link-dependencies-for-configs": "{% assign build-types = properties.build-types | split: ',' %}{% for config in configs %}{% for build-type in build-types %}xpm run link-dependencies --config {{ config }}-{{ build-type }}{{ os.EOL }}{% endfor %}{% endfor %}",
68-
"actions-prepare-build-test-for-configs": "{% assign build-types = properties.build-types | split: ',' %}{% assign test-actions = properties.test-actions | split: ',' %}{% for config in configs %}{% for build-type in build-types %}{% for test-action in test-actions %}xpm run {{ test-action }} --config {{ config }}-{{ build-type }}{{ os.EOL }}{% endfor %}{% endfor %}{% endfor %}"
58+
"configs-ci-non-darwin": [
59+
"native-cmake-gcc"
60+
],
61+
"configs-ci": [
62+
"native-cmake-clang",
63+
"native-meson-clang",
64+
"qemu-cortex-m0-cmake-gcc",
65+
"qemu-cortex-m7f-cmake-gcc",
66+
"qemu-riscv-rv32imac-cmake-gcc",
67+
"qemu-cortex-m0-meson-gcc"
68+
],
69+
"configs-selected-non-darwin": [
70+
"native-cmake-gcc",
71+
"native-meson-gcc"
72+
],
73+
"configs-selected": [
74+
"native-cmake-clang",
75+
"native-meson-clang",
76+
"qemu-cortex-m0-cmake-gcc",
77+
"qemu-cortex-m0-meson-gcc",
78+
"qemu-cortex-m4f-cmake-gcc",
79+
"qemu-cortex-m4f-meson-gcc",
80+
"qemu-cortex-a72-cmake-gcc",
81+
"qemu-cortex-a72-meson-gcc",
82+
"qemu-riscv-rv32imac-cmake-gcc",
83+
"qemu-riscv-rv32imac-meson-gcc"
84+
],
85+
"native-gcc-non-darwin-versions": [
86+
"15",
87+
"14",
88+
"13",
89+
"12",
90+
"11"
91+
],
92+
"native-clang-versions": [
93+
"20",
94+
"19",
95+
"18",
96+
"17",
97+
"16"
98+
],
99+
"cortex-gcc-versions": [
100+
"14",
101+
"13",
102+
"12",
103+
"11"
104+
],
105+
"riscv-gcc-versions": [
106+
"15",
107+
"14",
108+
"13",
109+
"12"
110+
],
111+
"qemu-cortex-variants": [
112+
"m0",
113+
"m3",
114+
"m4f",
115+
"m7f",
116+
"a15",
117+
"a72"
118+
],
119+
"qemu-riscv-variants": [
120+
"rv32imac",
121+
"rv64imafdc"
122+
],
123+
"builders": [
124+
"cmake",
125+
"meson"
126+
],
127+
"build-types": [
128+
"debug",
129+
"release"
130+
],
131+
"test-actions": [
132+
"prepare",
133+
"build",
134+
"test"
135+
],
136+
"compute-latest-non-darwin-configs": "{% assign configs = [ 'native-cmake-gcc', 'native-meson-gcc' ] %}",
137+
"compute-latest-configs": "{% assign configs = [ 'native-cmake-clang', 'native-meson-clang' ] %}{% for variant in properties.qemu-cortex-variants %}{% for builder in properties.builders %}{% assign config = 'qemu-cortex-' | append: variant | append: '-' | append: builder | append: '-gcc' %}{% assign configs = configs | push: config %}{% endfor %}{% endfor %}{% for variant in properties.qemu-riscv-variants %}{% for builder in properties.builders %}{% assign config = 'qemu-riscv-' | append: variant | append: '-' | append: builder | append: '-gcc' %}{% assign configs = configs | push: config %}{% endfor %}{% endfor %}",
138+
"compute-all-non-darwin-configs": "{% assign configs = '' | split: '' %}{% for builder in properties.builders %}{% for version in properties.native-gcc-non-darwin-versions %}{% assign config = 'native-' | append: builder | append: '-gcc' | append: version %}{% assign configs = configs | push: config %}{% endfor %}{% endfor %}",
139+
"compute-all-configs": "{% assign configs = '' | split: '' %}{% for builder in properties.builders %}{% for version in properties.native-clang-versions %}{% assign config = 'native-' | append: builder | append: '-clang' | append: version %}{% assign configs = configs | push: config %}{% endfor %}{% endfor %}{% for variant in properties.qemu-cortex-variants %}{% for builder in properties.builders %}{% for version in properties.cortex-gcc-versions %}{% assign config = 'qemu-cortex-' | append: variant | append: '-' | append: builder | append: '-gcc' | append: version %}{% assign configs = configs | push: config %}{% endfor %}{% endfor %}{% endfor %}{% for variant in properties.qemu-riscv-variants %}{% for builder in properties.builders %}{% for version in properties.riscv-gcc-versions %}{% assign config = 'qemu-riscv-' | append: variant | append: '-' | append: builder | append: '-gcc' | append: version %}{% assign configs = configs | push: config %}{% endfor %}{% endfor %}{% endfor %}",
140+
"actions-install-for-configs": "{% for config in configs %}{% for build-type in properties.build-types %}xpm install --config {{ config }}-{{ build-type }}{{ os.EOL }}{% endfor %}{% endfor %}",
141+
"actions-link-dependencies-for-configs": "{% for config in configs %}{% for build-type in properties.build-types %}xpm run link-dependencies --config {{ config }}-{{ build-type }}{{ os.EOL }}{% endfor %}{% endfor %}",
142+
"actions-prepare-build-test-for-configs": "{% for config in configs %}{% for build-type in properties.build-types %}{% for test-action in properties.test-actions %}xpm run {{ test-action }} --config {{ config }}-{{ build-type }}{{ os.EOL }}{% endfor %}{% endfor %}{% endfor %}",
143+
"actions-prepare-build-test-for-config": "{% for build-type in properties.build-types %}{% for test-action in properties.test-actions %}xpm run {{ test-action }} --config {{ config }}-{{ build-type }}{{ os.EOL }}{% endfor %}{% endfor %}",
144+
"actions-clean-for-configs": "{% for config in configs %}{% for build-type in properties.build-types %}xpm run clean --config {{ config }}-{{ build-type }}{{ os.EOL }}{% endfor %}{% endfor %}"
69145
},
70146
"actions": {
71147
"deep-clean": "del-cli build node_modules xpacks package-lock.json",
@@ -85,64 +161,75 @@
85161
],
86162
"install-ci": [
87163
"xpm install",
88-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-ci-non-darwin | split: ',' %}{{ properties.actions-install-for-configs }}{% endif %}",
89-
"{% assign configs = properties.configs-ci | split: ',' %}{% assign build-types = properties.build-types | split: ',' %}{{ properties.actions-install-for-configs }}"
164+
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-ci-non-darwin %}{{ properties.actions-install-for-configs }}{% endif %}",
165+
"{% assign configs = properties.configs-ci %}{{ properties.actions-install-for-configs }}"
90166
],
91167
"link-dependencies-ci": [
92168
"xpm run link-dependencies",
93-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-ci-non-darwin | split: ',' %}{{ properties.actions-install-for-configs }}{% endif %}",
94-
"{% assign configs = properties.configs-ci | split: ',' %}{{ properties.actions-link-dependencies-for-configs }}"
169+
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-ci-non-darwin %}{{ properties.actions-install-for-configs }}{% endif %}",
170+
"{% assign configs = properties.configs-ci %}{{ properties.actions-link-dependencies-for-configs }}"
95171
],
96172
"test-ci": [
97-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-ci-non-darwin | split: ',' %}{{ properties.actions-prepare-build-test-for-configs }}{% endif %}",
98-
"{% assign configs = properties.configs-ci | split: ',' %}{{ properties.actions-prepare-build-test-for-configs }}"
173+
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-ci-non-darwin %}{{ properties.actions-prepare-build-test-for-configs }}{% endif %}",
174+
"{% assign configs = properties.configs-ci %}{{ properties.actions-prepare-build-test-for-configs }}"
175+
],
176+
"clean-ci": [
177+
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-ci-non-darwin %}{{ properties.actions-clean-for-configs }}{% endif %}",
178+
"{% assign configs = properties.configs-ci %}{{ properties.actions-clean-for-configs }}"
99179
],
100180
"install-selected": [
101181
"xpm install",
102-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-selected-non-darwin | split: ',' %}{{ properties.actions-install-for-configs }}{% endif %}",
103-
"{% assign configs = properties.configs-selected | split: ',' %}{{ properties.actions-install-for-configs }}"
182+
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-selected-non-darwin %}{{ properties.actions-install-for-configs }}{% endif %}",
183+
"{% assign configs = properties.configs-selected %}{{ properties.actions-install-for-configs }}"
104184
],
105185
"link-dependencies-selected": [
106186
"xpm run link-dependencies",
107-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-selected-non-darwin | split: ',' %}{{ properties.actions-install-for-configs }}{% endif %}",
108-
"{% assign configs = properties.configs-selected | split: ',' %}{{ properties.actions-install-for-configs }}"
187+
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-selected-non-darwin %}{{ properties.actions-install-for-configs }}{% endif %}",
188+
"{% assign configs = properties.configs-selected %}{{ properties.actions-install-for-configs }}"
109189
],
110190
"test-selected": [
111-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-selected-non-darwin | split: ',' %}{{ properties.actions-prepare-build-test-for-configs }}{% endif %}",
112-
"{% assign configs = properties.configs-selected | split: ',' %}{{ properties.actions-prepare-build-test-for-configs }}"
191+
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-selected-non-darwin %}{{ properties.actions-prepare-build-test-for-configs }}{% endif %}",
192+
"{% assign configs = properties.configs-selected %}{{ properties.actions-prepare-build-test-for-configs }}"
193+
],
194+
"clean-selected": [
195+
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-selected-non-darwin %}{{ properties.actions-clean-for-configs }}{% endif %}",
196+
"{% assign configs = properties.configs-selected %}{{ properties.actions-clean-for-configs }}"
113197
],
114198
"install-latest": [
115199
"xpm install",
116-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-latest-non-darwin | split: ',' %}{{ properties.actions-install-for-configs }}{% endif %}",
117-
"{% assign configs = properties.configs-latest | split: ',' %}{{ properties.actions-install-for-configs }}"
200+
"{% if os.platform != 'darwin' %}{{ properties.compute-latest-non-darwin-configs }}{{ properties.actions-install-for-configs }}{% endif %}",
201+
"{{ properties.compute-latest-configs }}{{ properties.actions-install-for-configs }}"
118202
],
119203
"link-dependencies-latest": [
120204
"xpm run link-dependencies",
121-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-latest-non-darwin | split: ',' %}{{ properties.actions-install-for-configs }}{% endif %}",
122-
"{% assign configs = properties.configs-latest | split: ',' %}{{ properties.actions-install-for-configs }}"
205+
"{% if os.platform != 'darwin' %}{{ properties.compute-latest-non-darwin-configs }}{{ properties.actions-install-for-configs }}{% endif %}",
206+
"{{ properties.compute-latest-configs }}{{ properties.actions-install-for-configs }}"
123207
],
124208
"test-latest": [
125-
"{% if os.platform != 'darwin' %}{% assign configs = properties.configs-latest-non-darwin | split: ',' %}{{ properties.actions-prepare-build-test-for-configs }}{% endif %}",
126-
"{% assign configs = properties.configs-latest | split: ',' %}{{ properties.actions-prepare-build-test-for-configs }}"
209+
"{% if os.platform != 'darwin' %}{{ properties.compute-latest-non-darwin-configs }}{{ properties.actions-prepare-build-test-for-configs }}{% endif %}",
210+
"{{ properties.compute-latest-configs }}{{ properties.actions-prepare-build-test-for-configs }}"
211+
],
212+
"clean-latest": [
213+
"{% if os.platform != 'darwin' %}{{ properties.compute-latest-non-darwin-configs }}{{ properties.actions-clean-for-configs }}{% endif %}",
214+
"{{ properties.compute-latest-configs }}{{ properties.actions-clean-for-configs }}"
127215
],
128216
"install-all": [
129217
"xpm install",
130-
"xpm install --all-configs"
218+
"{% if os.platform != 'darwin' %}{{ properties.compute-all-non-darwin-configs }}{{ properties.actions-install-for-configs }}{% endif %}",
219+
"{{ properties.compute-all-configs }}{{ properties.actions-install-for-configs }}"
131220
],
132221
"link-dependencies-all": [
133222
"xpm run link-dependencies",
134-
"xpm run link-dependencies --all-configs"
223+
"{% if os.platform != 'darwin' %}{{ properties.compute-all-non-darwin-configs }}{{ properties.actions-install-for-configs }}{% endif %}",
224+
"{{ properties.compute-all-configs }}{{ properties.actions-install-for-configs }}"
135225
],
136226
"test-all": [
137-
"xpm run test-native-cmake-all",
138-
"xpm run test-native-meson-all",
139-
"xpm run test-cortex-cmake-all",
140-
"xpm run test-cortex-meson-all",
141-
"xpm run test-riscv-cmake-all",
142-
"xpm run test-riscv-meson-all"
227+
"{% if os.platform != 'darwin' %}{{ properties.compute-all-non-darwin-configs }}{{ properties.actions-prepare-build-test-for-configs }}{% endif %}",
228+
"{{ properties.compute-all-configs }}{{ properties.actions-prepare-build-test-for-configs }}"
143229
],
144230
"clean-all": [
145-
"xpm run clean --all-configs --ignore-errors"
231+
"{% if os.platform != 'darwin' %}{{ properties.compute-all-non-darwin-configs }}{{ properties.actions-clean-for-configs }}{% endif %}",
232+
"{{ properties.compute-all-configs }}{{ properties.actions-clean-for-configs }}"
146233
],
147234
"test-native-cmake-all": [
148235
"xpm run test-native-cmake-sys{% if os.platform != 'darwin' %} --ignore-errors{% endif %}",

0 commit comments

Comments
 (0)