Compare commits

..

5 Commits
ci ... dev

Author SHA1 Message Date
Ilya Fedin
5739a37c7f Cache ThirdParty together with Libraries on macOS 2025-12-27 09:25:47 +04:00
Ilya Fedin
8639936e45 Remove depot_tools and yasm
They're actually unused
2025-12-27 09:25:47 +04:00
Ilya Fedin
89d9270ea6 Add six dependency required by gyp on macOS 2025-12-27 09:25:47 +04:00
Ilya Fedin
e52aa98a9f Switch service actions to ubuntu-slim 2025-12-26 14:11:29 +04:00
Ilya Fedin
af24830233 Fix Ctrl+, shortcut on Linux
Regression was introduced in 30819509d3
2025-12-26 14:11:14 +04:00
16 changed files with 18 additions and 70 deletions

View File

@@ -6,7 +6,7 @@ on:
jobs:
cant-reproduce:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- uses: lee-dohm/no-response@v0.5.0
with:

View File

@@ -9,7 +9,7 @@ on:
jobs:
Copyright-year:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- uses: desktop-app/action_code_updater@master
with:

View File

@@ -6,7 +6,7 @@ on:
jobs:
comment:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- name: Process an issue.
uses: desktop-app/action_issue_closer@master

View File

@@ -6,7 +6,7 @@ on:
jobs:
lock:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- uses: dessant/lock-threads@v6
with:

View File

@@ -76,19 +76,13 @@ jobs:
sudo sed -i '' '/CMAKE_${lang}_FLAGS_DEBUG_INIT/s/ -g//' /opt/homebrew/share/cmake/Modules/Compiler/GNU.cmake
- name: ThirdParty cache.
id: cache-third-party
uses: actions/cache@v5
with:
path: ThirdParty
key: ${{ runner.OS }}-third-party-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
restore-keys: ${{ runner.OS }}-third-party-
- name: Libraries cache.
id: cache-libs
uses: actions/cache@v5
with:
path: Libraries
path: |
Libraries
ThirdParty
key: ${{ runner.OS }}-libs-${{ hashFiles(format('{0}/{1}', env.REPO_NAME, env.PREPARE_PATH)) }}
restore-keys: ${{ runner.OS }}-libs-

View File

@@ -6,7 +6,7 @@ on:
jobs:
User-agent:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- uses: desktop-app/action_code_updater@master
with:

View File

@@ -8,7 +8,7 @@ on:
jobs:
needs-user-action:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- uses: lee-dohm/no-response@v0.5.0
with:

View File

@@ -5,7 +5,7 @@ on:
jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- uses: actions/stale@v10
with:

View File

@@ -9,7 +9,7 @@ on:
jobs:
User-agent:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- uses: desktop-app/action_code_updater@master
with:

View File

@@ -8,7 +8,7 @@ on:
jobs:
waiting-for-answer:
runs-on: ubuntu-latest
runs-on: ubuntu-slim
steps:
- uses: lee-dohm/no-response@v0.5.0
with:

View File

@@ -1902,9 +1902,6 @@ void ParticipantsBoxController::editRestrictedDone(
void ParticipantsBoxController::kickParticipant(not_null<PeerData*> participant) {
const auto user = participant->asUser();
if (user && user->isInaccessible()) {
return kickParticipantSure(participant);
}
const auto text = ((_peer->isChat() || _peer->isMegagroup())
? tr::lng_profile_sure_kick
: tr::lng_profile_sure_kick_channel)(
@@ -2131,12 +2128,7 @@ auto ParticipantsBoxController::computeType(
: (user && _additional.adminRights(user).has_value())
? Rights::Admin
: Rights::Normal;
result.canRemove = _additional.canRemoveParticipant(participant)
&& user
&& user->isInaccessible();
if (!result.canRemove) {
result.adminRank = user ? _additional.adminRank(user) : QString();
}
result.adminRank = user ? _additional.adminRank(user) : QString();
return result;
}

View File

@@ -30,9 +30,7 @@ MemberListRow::MemberListRow(
void MemberListRow::setType(Type type) {
_type = type;
PeerListRowWithLink::setActionLink(_type.canRemove
? tr::lng_profile_delete_removed(tr::now)
: !_type.adminRank.isEmpty()
PeerListRowWithLink::setActionLink(!_type.adminRank.isEmpty()
? _type.adminRank
: (_type.rights == Rights::Creator)
? tr::lng_owner_badge(tr::now)
@@ -46,19 +44,11 @@ MemberListRow::Type MemberListRow::type() const {
}
bool MemberListRow::rightActionDisabled() const {
return !canRemove();
return true;
}
QMargins MemberListRow::rightActionMargins() const {
const auto skip = st::contactsCheckPosition.x();
if (canRemove()) {
const auto &st = st::defaultPeerListItem;
return QMargins(
skip,
(st.height - st.nameStyle.font->height) / 2,
st.photoPosition.x() + skip,
0);
}
return QMargins(
skip,
st::defaultPeerListItem.namePosition.y(),
@@ -82,10 +72,6 @@ void MemberListRow::refreshStatus() {
}
}
bool MemberListRow::canRemove() const {
return _type.canRemove;
}
std::unique_ptr<ParticipantsBoxController> CreateMembersController(
not_null<Window::SessionNavigation*> navigation,
not_null<PeerData*> peer) {

View File

@@ -28,7 +28,6 @@ public:
};
struct Type {
Rights rights;
bool canRemove = false;
QString adminRank;
};
@@ -43,7 +42,6 @@ public:
not_null<UserData*> user() const;
private:
[[nodiscard]] bool canRemove() const;
Type _type;
};

View File

@@ -374,7 +374,6 @@ void MainWindow::createGlobalMenu() {
QKeySequence(Qt::ControlModifier | Qt::Key_Comma));
prefs->setMenuRole(QAction::PreferencesRole);
prefs->setShortcutContext(Qt::WidgetShortcut);
auto tools = psMainMenu->addMenu(tr::lng_linux_menu_tools(tr::now));

View File

@@ -12,7 +12,7 @@ RUN dnf -y install epel-release \
&& dnf config-manager --set-enabled powertools \
&& dnf -y install cmake autoconf automake libtool pkgconfig make patch git \
python3.11-pip python3.11-devel gperf flex bison clang clang-tools-extra \
lld nasm yasm file which wget perl-open perl-XML-Parser perl-IPC-Cmd \
lld nasm file which wget perl-open perl-XML-Parser perl-IPC-Cmd \
xorg-x11-util-macros $TOOLSET-gcc $TOOLSET-gcc-c++ $TOOLSET-binutils \
$TOOLSET-gdb $TOOLSET-libasan-devel libffi-devel fontconfig-devel \
freetype-devel libX11-devel wayland-devel alsa-lib-devel \

View File

@@ -87,8 +87,6 @@ pathPrefixes = [
'ThirdParty\\gyp',
] if win else [
'ThirdParty/gyp',
'ThirdParty/yasm',
'ThirdParty/depot_tools',
]
pathPrefix = ''
for singlePrefix in pathPrefixes:
@@ -478,8 +476,7 @@ win:
mingw-w64-x86_64-gperf ^
mingw-w64-x86_64-nasm ^
mingw-w64-x86_64-perl ^
mingw-w64-x86_64-pkgconf ^
mingw-w64-x86_64-yasm
mingw-w64-x86_64-pkgconf
SET PATH=%PATH_BACKUP_%
""", 'ThirdParty')
@@ -506,13 +503,6 @@ win:
del jom.zip
""", 'ThirdParty')
stage('depot_tools', """
mac:
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
cd depot_tools
./update_depot_tools
""", 'ThirdParty')
if not mac or 'build-stackwalk' in options:
stage('gyp', """
win:
@@ -523,16 +513,7 @@ mac:
python3 -m pip install \\
--ignore-installed \\
--target=$THIRDPARTY_DIR/gyp \\
git+https://chromium.googlesource.com/external/gyp@master
""", 'ThirdParty')
stage('yasm', """
mac:
git clone https://github.com/yasm/yasm.git
cd yasm
git checkout 41762bea
./autogen.sh
make $MAKE_THREADS_CNT
git+https://chromium.googlesource.com/external/gyp@master six
""", 'ThirdParty')
stage('lzma', """
@@ -1116,7 +1097,6 @@ depends:patches/build_libvpx_win.sh
mac:
find ../patches/libvpx -type f -print0 | sort -z | xargs -0 git apply
depends:yasm/yasm
./configure --prefix=$USED_PREFIX \
--target=arm64-darwin20-gcc \
--disable-examples \
@@ -1223,7 +1203,6 @@ depends:patches/build_ffmpeg_win.sh
SET PATH=%PATH_BACKUP_%
mac:
export PKG_CONFIG_PATH=$USED_PREFIX/lib/pkgconfig
depends:yasm/yasm
configureFFmpeg() {
arch=$1