diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 9fa82c7..80f874d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -36,7 +36,6 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install - STOREPASS: ${{secrets.STOREPASS}} artifact_name: build_android ANDROID_PLATFORM: android-23 ANDROID_NATIVE_API_LEVEL: 23 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a9bdd38..42a8835 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -75,7 +75,7 @@ jobs: env: RabbitCommon_DIR: ${{env.SOURCE_DIR}}/RabbitCommon run: | - export Qt6_DIR=/usr/lib/`uname -a`-linux-gnu/cmake/Qt6 + export Qt6_DIR=/usr/lib/`uname -m`-linux-gnu/cmake/Qt6 ./build_debpackage.sh cp ../rabbitcalendar_${{env.Calendar_VERSION}}_amd64.deb rabbitcalendar_${{env.Calendar_VERSION}}_ubuntu_amd64.deb diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar index a039f5d..55f0f28 160000 --- a/3th_libs/LunarCalendar +++ b/3th_libs/LunarCalendar @@ -1 +1 @@ -Subproject commit a039f5daa206a876afc57fdc6bc7d3004598b950 +Subproject commit 55f0f28c864d5955deec5efef4c8c661944ed6c9 diff --git a/build_debpackage.sh b/build_debpackage.sh index 87549b6..fef574b 100755 --- a/build_debpackage.sh +++ b/build_debpackage.sh @@ -4,7 +4,12 @@ if [ -n "$1" -a -z "$QT_ROOT" ]; then QT_ROOT=$1 fi -if [ ! -f /usr/bin/qmake -a -z "$QT_ROOT" ]; then +if [ -d "/usr/lib/`uname -m`-linux-gnu" -a -z "$QT_ROOT" ]; then + QT_ROOT="/usr/lib/`uname -m`-linux-gnu" +fi + +if [ -z "$QT_ROOT" ]; then + echo "QT_ROOT=$QT_ROOT" echo "$0 QT_ROOT RabbitCommon_DIR" exit -1 fi @@ -15,13 +20,20 @@ fi if [ -z "$RabbitCommon_DIR" ]; then RabbitCommon_DIR=`pwd`/../RabbitCommon + echo "RabbitCommon_DIR=$RabbitCommon_DIR" +fi + +if [ ! -d "$RabbitCommon_DIR" ]; then + echo "QT_ROOT=$QT_ROOT" + echo "RabbitCommon_DIR=$RabbitCommon_DIR" + echo "$0 QT_ROOT RabbitCommon_DIR" + exit -1 fi -export RabbitCommon_DIR=$RabbitCommon_DIR export QT_ROOT=$QT_ROOT +export RabbitCommon_DIR=$RabbitCommon_DIR export PATH=$QT_ROOT/bin:$PATH -export LD_LIBRARY_PATH=$QT_ROOT/lib/i386-linux-gnu:$QT_ROOT/lib:$LD_LIBRARY_PATH -export PKG_CONFIG_PATH=$QT_ROOT/lib/pkgconfig:$PKG_CONFIG_PATH + #fakeroot debian/rules binary # -p, --sign-command=sign-command