From 677d6b77302bad50c7c77db52043a0b4fc113217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 6 Jan 2022 16:12:05 -0500
Subject: [PATCH] build.py: remove lrc
Change-Id: I351d4c964967340277891b7e541e37615304f80c
---
Jenkinsfile | 3 +--
build.py | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 976a891a..3766bfa1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -139,8 +139,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
git reset --hard origin/${params.CHANNEL}
# Submodules are generally not managed by merging
git status
- rm -rf client-gnome lrc-gnome
- git merge -X theirs --no-commit FETCH_HEAD || git status && git add `git diff --name-status --diff-filter=U | awk '{print \$2}'`
+ git merge -X theirs --no-commit FETCH_HEAD
"""
}
}
diff --git a/build.py b/build.py
index ff0ed626..5dce0b01 100755
--- a/build.py
+++ b/build.py
@@ -395,7 +395,7 @@ def run_init():
for name in module_names:
copy_file("./scripts/commit-msg", ".git/modules/"+name+"/hooks")
- module_names_to_format = ['daemon', 'lrc', 'client-qt', 'plugins']
+ module_names_to_format = ['daemon', 'client-qt', 'plugins']
for name in module_names_to_format:
execute_script(
['./scripts/format.sh --install %(path)s'],
--
GitLab