Use r2-6.2.6 in the ci

test/test_import.py is referenced but not committed on all branches,
which makes meson configure abort on Windows with
ERROR: File test/test_import.py does not exist. Wire the test only
when the file is present.

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: CI
 
 env:
-  R2V: 6.2.2
+  R2V: 6.2.6
 
 on:
   push:

Makefile

@@ -76,7 +76,31 @@ user-uninstall: uninstall-plugin
 	rm -f "$(R2PM_BINDIR)/$(EXEC)"
 
 # Binary package for r2pm -bi: plugins/ and bin/ for this r2 version and platform
-BINDIST_ZIP = r2unity-$(shell r2 -qv)-$(shell r2pm -H R2PM_OS)-$(shell r2pm -H R2PM_ARCH)-$(shell r2pm -H R2PM_BITS).zip
+# Binary package for r2pm -bi: plugins/ and bin/ for this r2 version and platform
+# R2PM_OS/ARCH/BITS require a recent r2pm; fall back to uname when missing
+R2PM_OS_SH = $(shell r2pm -H R2PM_OS 2>/dev/null)
+R2PM_ARCH_SH = $(shell r2pm -H R2PM_ARCH 2>/dev/null)
+R2PM_BITS_SH = $(shell r2pm -H R2PM_BITS 2>/dev/null)
+ifeq ($(R2PM_OS_SH),)
+ifeq ($(shell uname -s),Darwin)
+R2PM_OS_SH = darwin
+else
+R2PM_OS_SH = linux
+endif
+endif
+ifeq ($(R2PM_ARCH_SH),)
+ifeq ($(shell uname -m),x86_64)
+R2PM_ARCH_SH = x86
+else ifneq (,$(filter $(shell uname -m),aarch64 arm64))
+R2PM_ARCH_SH = arm
+else
+R2PM_ARCH_SH = $(shell uname -m)
+endif
+endif
+ifeq ($(R2PM_BITS_SH),)
+R2PM_BITS_SH = 64
+endif
+BINDIST_ZIP = r2unity-$(shell r2 -qv)-$(R2PM_OS_SH)-$(R2PM_ARCH_SH)-$(R2PM_BITS_SH).zip
 
 bindist: $(EXEC) $(PLUGINS)
 	rm -rf build/bindist $(BINDIST_ZIP)

meson.build

@@ -1,7 +1,7 @@
 project(
   'r2unity',
   'c',
-  version: '1.2.8',
+  version: '1.2.9',
   default_options: [
     'c_std=c99',
     'warning_level=2',
@@ -115,8 +115,11 @@ if build_plugins
     install_dir: r2_plugindir,
   )
 
+  # test_import.py is not always present (it is not committed yet on every
+  # branch); only wire the test when the file exists
+  fs = import('fs')
   python = find_program('python3', required: false)
-  if python.found()
+  if python.found() and fs.exists('test' / 'test_import.py')
     test('r2unity-class-import', python,
       args: [files('test/test_import.py'), core_plugin],
     )