From aabbb29bb88385fd753fe9d4ca358abc70ba0dcd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 13 Jan 2024 14:35:43 +0200 Subject: [PATCH] Ignore patch rejection. --- .cirrus.yml | 3 ++- appveyor.yml | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 67518d414..4103ea219 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -257,7 +257,8 @@ macos_task_template: &MACOS_TASK_TEMPLATE - qbs --version # Patch Qbs. Remove after Qbs 2.2.1+. - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent - - patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch + - patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch || true + - rm -f $(brew --prefix qbs)/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js.rej - rm $HOME/qbs-pkg-config-probe.patch build_script: - echo $PATH diff --git a/appveyor.yml b/appveyor.yml index ac603fb55..2c9f7aa91 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -728,7 +728,8 @@ for: - qbs --version # Patch Qbs. Remove after Qbs 2.2.1+. - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent - - patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch + - patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch || true + - rm -f $(brew --prefix qbs)/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js.rej - rm $HOME/qbs-pkg-config-probe.patch - /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent - unzip ${HOME}/macdeployqt-main.zip -d ${HOME} @@ -911,7 +912,8 @@ for: - qbs --version # Patch Qbs. Remove after Qbs 2.2.1+. - curl https://gist.githubusercontent.com/dismine/43f3c51e05f3317c5d4fe16cd3c4b6d8/raw/2d297bcb53c2c022f740509923adf1eb1796afe2/qbs-pkg-config-probe.patch --output $HOME/qbs-pkg-config-probe.patch --silent - - patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch + - patch -N -d $(brew --prefix qbs)/ -p1 < $HOME/qbs-pkg-config-probe.patch || true + - rm -f $(brew --prefix qbs)/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js.rej - rm $HOME/qbs-pkg-config-probe.patch - /usr/bin/curl -LJ https://github.com/dismine/macdeployqt/archive/refs/heads/main.zip --output ${HOME}/macdeployqt-main.zip --silent - unzip ${HOME}/macdeployqt-main.zip -d ${HOME}