diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a9ae23c..407d4f1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: iaito CI env: - R2V: 5.8.8 + R2V: 5.9.0 on: push: @@ -85,10 +85,10 @@ jobs: python-version: 3.8.x - name: homebrew dependencies run: | - brew update - brew install pkg-config qt@5 + brew update || true + brew install pkg-config qt@5 || true brew unlink qt@5 || true - brew link --force qt@5 + brew link --force qt@5 || true pip3 install meson pip3 install ninja - name: install r2 @@ -144,10 +144,10 @@ jobs: if: contains(matrix.os, 'macos') run: | brew update --preinstall # temporary workaround for https://github.com/Homebrew/homebrew-bundle/issues/751 - brew install coreutils pkg-config - brew install pkg-config qt@5 + brew install coreutils pkg-config || true + brew install pkg-config qt@5 || true brew unlink qt@5 || true - brew link --force qt@5 + brew link --force qt@5 || true pip3 install meson pip3 install ninja - name: macos build diff --git a/configure b/configure index 4fe5af66..387970bb 100755 --- a/configure +++ b/configure @@ -113,12 +113,12 @@ done : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s} : ${INSTALL_MAN:=${INSTALL} -m 444} : ${INSTALL_LIB:=${INSTALL} -m 755 -c} - PKGNAME='iaito' ; VERSION='5.8.9' ; VERSION_MAJOR=5; VERSION_MINOR=8; VERSION_PATCH=9; VERSION_NUMBER=50809; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; + PKGNAME='iaito' ; VERSION='5.9.0' ; VERSION_MAJOR=5; VERSION_MINOR=9; VERSION_PATCH=0; VERSION_NUMBER=50900; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake " ; } show_usage() { cat <." exit 0 @@ -226,7 +226,7 @@ case $flag in show_version ; ;; -r|--r|--report) echo "PKGNAME: iaito" -echo "VERSION: 5.8.9" +echo "VERSION: 5.9.0" echo "AUTHOR: pancake" echo "EMAIL: pancake@nopcode.org" echo "LANGS: c++" diff --git a/configure.acr b/configure.acr index f484ce2a..217682ee 100644 --- a/configure.acr +++ b/configure.acr @@ -1,5 +1,5 @@ PKGNAME iaito -VERSION 5.8.9 +VERSION 5.9.0 CONTACT pancake ; pancake@nopcode.org LANG_CXX! diff --git a/src/Iaito.pro b/src/Iaito.pro index e88891cb..d54c4c30 100644 --- a/src/Iaito.pro +++ b/src/Iaito.pro @@ -3,8 +3,8 @@ TEMPLATE = app TARGET = iaito IAITO_VERSION_MAJOR = 5 -IAITO_VERSION_MINOR = 8 -IAITO_VERSION_PATCH = 9 +IAITO_VERSION_MINOR = 9 +IAITO_VERSION_PATCH = 0 CONFIG+=app_bundle # LIBS+= -dead_strip diff --git a/src/org.radare.iaito.appdata.xml b/src/org.radare.iaito.appdata.xml index e169d02f..468ddf45 100644 --- a/src/org.radare.iaito.appdata.xml +++ b/src/org.radare.iaito.appdata.xml @@ -41,9 +41,10 @@ pancake radare2 - + -

Work in progress version in sync with r2-5.8.9

+

Stability fixes after lots of testing

+

Sync with r2-5.9, stay source compatible with 5.8