Skip to content

Commit eca2098

Browse files
iakoviakov
committed
Merge remote-tracking branch 'upstream/master' into pull/1882
2 parents e4b8049 + 6f9404f commit eca2098

File tree

15 files changed

+29
-37
lines changed

15 files changed

+29
-37
lines changed

‎.github/workflows/installer.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,26 +132,22 @@ jobs:
132132
run: |
133133
PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".js --generate-mode javascript --close \
134134
-s 5 --script-path "$i".js -m script "$i"; done'
135-
if: ${{ !startsWith(inputs.os, 'macos') }}
136135
timeout-minutes: 15
137136

138137
- name: Run minimal Python interpeter tests in direct script mode
139138
run: |
140139
PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".py \
141140
--close -s 5 --script-path "$i".py -m script "$i"; done'
142-
if: ${{ !startsWith(inputs.os, 'macos') }}
143141
timeout-minutes: 15
144142

145143
- name: Run minimal Javascript interpeter tests as fields in .qrs (For backward compatibility)
146144
run: |
147145
PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$PATCHER_NAME" -s "$i".js "$i" \
148146
&& "$TWOD_EXEC_NAME" --close -s 5 -m script "$i"; done'
149-
if: ${{ !startsWith(inputs.os, 'macos') }}
150147
timeout-minutes: 5
151148

152149
- name: Run minimal Python interpeter tests as fields in .qrs (For backward compatibility)
153150
run: |
154151
PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$PATCHER_NAME" -s "$i".py "$i" \
155152
&& "$TWOD_EXEC_NAME" --close -s 5 -m script "$i"; done'
156-
if: ${{ !startsWith(inputs.os, 'macos') }}
157153
timeout-minutes: 5

‎buildScripts/github/build_installer.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ set -euxo pipefail
33
BRANCH_NAME="${BRANCH_NAME:-${GITHUB_REF#refs/*/}}"
44
BRANCH_NAME=${BRANCH_NAME//\//-}
55

6-
QTBIN=${QTBIN:-$($EXECUTOR bash -c 'eval $(make qmake -n | cut -f 1 -d " ") -query QT_INSTALL_BINS')}
7-
case $RUNNER_OS in
6+
QTBIN="${QTBIN:-$($EXECUTOR bash -c 'eval $(make qmake -n | cut -f 1 -d " ") -query QT_INSTALL_BINS')}"
7+
case "$RUNNER_OS" in
88
macOS)
9-
QTIFWBIN=$HOME/qtifw/bin
9+
QTIFWBIN="$HOME"/qtifw/bin
1010
TSNAME="trik-studio-installer-mac-$BRANCH_NAME.dmg"
1111
;;
1212
Linux)
@@ -19,23 +19,23 @@ df -h .
1919

2020
NEED_DEPLOY=$([[ "$GITHUB_REPOSITORY" == "trikset/trik-studio" && "${PULLREQUESTNUMBER:-false}" == "false" ]] && echo true || echo false )
2121

22-
if $NEED_DEPLOY ; then
22+
if "$NEED_DEPLOY" ; then
2323
$EXECUTOR bash -c "mkdir -p $HOME/.ssh && install -m 600 /dev/null $HOME/.ssh/id_rsa && echo \"$ssh_key\" > $HOME/.ssh/id_rsa"
2424
fi
2525

26-
if [[ $RUNNER_OS == Linux ]] ; then
26+
if [[ "$RUNNER_OS" == Linux ]] ; then
2727
echo Start build checker archive
2828
$EXECUTOR bash -c "bin/build-checker-installer.sh"
29-
if $NEED_DEPLOY ; then
29+
if "$NEED_DEPLOY" ; then
3030
$EXECUTOR bash -c "rsync -v --rsh='ssh -o StrictHostKeyChecking=no -vvv -i $HOME/.ssh/id_rsa' bin/trik_checker.tar.xz $username@$host:~/dl/ts/fresh/checker/checker-linux-$CONFIG-$BRANCH_NAME.tar.xz"
3131
fi
3232
fi
3333

3434
echo Start build installer
3535
$EXECUTOR bash -c "installer/build-trik-studio.sh $QTBIN $QTIFWBIN ."
3636

37-
INSTALLER_NAME=$(find installer -name "trik-studio*installer*" -print -quit)
37+
INSTALLER_NAME=$(find installer -name "trik-studio*installer*" -print -quit | grep . )
3838

39-
if $NEED_DEPLOY ; then
39+
if "$NEED_DEPLOY" ; then
4040
$EXECUTOR bash -c "rsync -v --rsh='ssh -o StrictHostKeyChecking=no -vvv -i $HOME/.ssh/id_rsa' $INSTALLER_NAME $username@$host:~/dl/ts/fresh/installer/$TSNAME"
4141
fi

‎buildScripts/github/install.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
#!/bin/bash
22
set -euxo pipefail
3+
BUILD_INSTALLER=${BUILD_INSTALLER:-true}
4+
TRIK_QT_VERSION=${TRIK_QT_VERSION:-5.15}
5+
XCODE_VERSION=${XCODE_VERSION:-14.3} # 14.3 on GHA worker is compatible with Qt5.15
6+
TRIK_PYTHON3_VERSION_MINOR=${TRIK_PYTHON3_VERSION_MINOR:-11}
7+
8+
39
TRIK_PYTHON=python3.${TRIK_PYTHON3_VERSION_MINOR}
410

511
install_qt(){

‎installer/build-installer.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@ find $PWD/packages/$PRODUCT -name prebuild-$OS.sh | bash -xe
8181
find . -type d -empty -delete
8282

8383
#echo "Building online installer..."
84-
#$QTIFW_DIR/binarycreator --online-only -c config/$PRODUCT-$OS_EXT.xml -p packages/qreal-base -p packages/$PRODUCT ${*:4} $PRODUCT-online-$OS_EXT-installer
84+
#$QTIFW_DIR/binarycreator --verbose --online-only -c config/$PRODUCT-$OS_EXT.xml -p packages/qreal-base -p packages/$PRODUCT ${*:4} $PRODUCT-online-$OS_EXT-installer
8585

8686
echo "Building offline installer..."
8787
case $(uname -s || echo None) in
8888
Linux) INSTALLER_EXT=.run;;
8989
Darwin) INSTALLER_EXT=.dmg;;
9090
*) INSTALLER_EXT=.exe;;
9191
esac
92-
$QTIFW_DIR/binarycreator --offline-only -c config/$PRODUCT-$OS_EXT.xml -p packages/qreal-base -p packages/$PRODUCT $PRODUCT-offline-$OS_EXT-installer$ADD_BIT-${FULL_VERSION}${INSTALLER_EXT}
92+
"$QTIFW_DIR"/binarycreator --verbose --offline-only -c "config/$PRODUCT-$OS_EXT.xml" -p packages/qreal-base -p "packages/$PRODUCT" "$PRODUCT-offline-$OS_EXT-installer$ADD_BIT-${FULL_VERSION}${INSTALLER_EXT}"
9393

9494
grep -r -l --include=*.xml '<Version>.*</Version>' . | xargs $GNU_SED_COMMAND -i -e "s/<Version>.*<\/Version>/<Version><\/Version>/"
9595

96-
[ -f $SSH_DIR/id_rsa ] && : || { echo "Done"; exit 0; }
96+
[ -f "$SSH_DIR/id_rsa" ] && : || { echo "Done"; exit 0; }
9797

9898
#echo "Building updates repository... This step can be safely skipped, the offline installer is already ready, press Ctrl+C if you are not sure what to do next."
9999
#rm -rf $PRODUCT-repository
@@ -103,6 +103,6 @@ grep -r -l --include=*.xml '<Version>.*</Version>' . | xargs $GNU_SED_COMMAND -i
103103
#scp -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -r $PRODUCT-repository/* qrealproject@195.19.241.150:/home/qrealproject/public/packages/$PRODUCT-repo-$OS_EXT
104104

105105
echo "Removing temporary files..."
106-
rm -rf $PRODUCT-repository
106+
rm -rf "$PRODUCT-repository"
107107

108108
echo "Done"

‎installer/packages/trik-studio/ru.qreal.root.trik.core/meta/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
pyinstaller==6.11.1
2-
numpy==2.2.1; python_version >= "3.11"
2+
numpy==2.2.2; python_version >= "3.11"
33
numpy==2.0.1; python_version < "3.11"
44

‎plugins/robots/common/twoDModel/src/engine/constraints/details/conditionsFactory.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ using namespace twoDModel::constraints::details;
2626
using namespace kitBase;
2727

2828
ConditionsFactory::ConditionsFactory(Events &events
29-
, const Variables &variables
3029
, const Objects &objects
3130
, StatusReporter &status)
3231
: mEvents(events)
33-
, mVariables(variables)
3432
, mObjects(objects)
3533
, mStatus(status)
3634
{

‎plugins/robots/common/twoDModel/src/engine/constraints/details/conditionsFactory.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace details {
2626
class ConditionsFactory
2727
{
2828
public:
29-
ConditionsFactory(Events &events, const Variables &variables, const Objects &objects, StatusReporter &status);
29+
ConditionsFactory(Events &events, const Objects &objects, StatusReporter &status);
3030

3131
/// Produces new condition instance that always returnes \a value.
3232
Condition constant(bool value) const;
@@ -81,7 +81,6 @@ class ConditionsFactory
8181
void reportError(const QString &message) const;
8282

8383
Events &mEvents;
84-
const Variables &mVariables;
8584
const Objects &mObjects;
8685
StatusReporter &mStatus;
8786
};

‎plugins/robots/common/twoDModel/src/engine/constraints/details/constraintsParser.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ConstraintsParser::ConstraintsParser(Events &events
3131
, mObjects(objects)
3232
, mTimeline(timeline)
3333
, mTriggers(mEvents, mVariables, status)
34-
, mConditions(mEvents, mVariables, mObjects, status)
34+
, mConditions(mEvents, mObjects, status)
3535
, mValues(mVariables, mObjects, status)
3636
{
3737
}

‎qrgui/textEditor/textManagerInterface.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SystemEvents;
2424

2525
namespace text {
2626
class QScintillaTextEdit;
27-
class LanguageInfo;
27+
struct LanguageInfo;
2828
}
2929

3030
class QRGUI_TEXT_EDITOR_EXPORT TextManagerInterface : public QObject

‎qrtest/unitTests/common.pri‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ INCLUDEPATH += \
3838
$$PWD/../../ \
3939
$$PWD/testUtils/include \
4040

41+
CONFIG += c++17 # for GTEST
42+
4143
# the line below suppresses warnings generated by google's headers
4244
QMAKE_CXXFLAGS += \
4345
-isystem $$PWD/../thirdparty/googletest/googletest/googletest/include \

0 commit comments

Comments
 (0)