From patchwork Sat May 16 20:29:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 26764 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 48A68BDCBC for ; Sat, 16 May 2026 20:29:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DEF1F6301A; Sat, 16 May 2026 22:29:17 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="iffP8cPn"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 47DAB62E9D for ; Sat, 16 May 2026 22:29:15 +0200 (CEST) Received: from killaraus.ideasonboard.com (2001-14ba-70f3-e800--a06.rev.dnainternet.fi [IPv6:2001:14ba:70f3:e800::a06]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 487A4324 for ; Sat, 16 May 2026 22:29:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1778963344; bh=5OGwC1VBaAQnZbHjPbbpZvKEpQlrVHrwlE/Oz3164T0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=iffP8cPnQ3DhHVHx19MJlosg3o1JVAfQlqfZCRU1Ifz0XTuYN8gvHhCm0dx/jrIMW qWNj02BFW7zy7gB3eCuIoqCXBob7pCyUnDCiPjhzh4yHQOBFprzq78tekTouDRDTy6 iRLKmSxRW78Ee2fFMW4oBGz6IzX0/SIo4zBec7Eg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH 1/2] Add commit ref name to docs deployment log message Date: Sat, 16 May 2026 23:29:11 +0300 Message-ID: <20260516202912.383234-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516202912.383234-1-laurent.pinchart@ideasonboard.com> References: <20260516202912.383234-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Print the commit ref name in the log message to help troubleshooting. Signed-off-by: Laurent Pinchart --- .gitlab-ci/deploy-libcamera-docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/deploy-libcamera-docs.sh b/.gitlab-ci/deploy-libcamera-docs.sh index 2108858aabf8..639fdf748d07 100755 --- a/.gitlab-ci/deploy-libcamera-docs.sh +++ b/.gitlab-ci/deploy-libcamera-docs.sh @@ -10,7 +10,7 @@ set -e source "$(dirname "$0")/lib.sh" libcamera_deploy_docs() { - echo "Deploying libcamera docs" + echo "Deploying libcamera docs for ${CI_COMMIT_REF_NAME}" rsync -rlz --delete --chmod=Do=rx,Fo=r \ --exclude .doctrees \ From patchwork Sat May 16 20:29:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 26765 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DB3F7C32F7 for ; Sat, 16 May 2026 20:29:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 88DED63029; Sat, 16 May 2026 22:29:18 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="pftdyLj0"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AB01A62E9D for ; Sat, 16 May 2026 22:29:16 +0200 (CEST) Received: from killaraus.ideasonboard.com (2001-14ba-70f3-e800--a06.rev.dnainternet.fi [IPv6:2001:14ba:70f3:e800::a06]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 912AB2F8 for ; Sat, 16 May 2026 22:29:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1778963345; bh=p3KrQr4dSdW1K6qBDUqUA+vwo2qhf5SUZDRkdztKkMw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=pftdyLj0U/QgQ3AGBIOh9qonyu5B26JDGCJjjLSTMwOXh9PHuBRvFLFxx1WVYVnHw pi+lxVpAPifvhgOnr8VYP0WLmqi7xiyw4jlY3BC4L+L2Dgvs/yYQSHKlMByOlhpqVc GaIHndB4uaW1NSkOQoGsWme2Cl6YyrgiW/h6Smxw= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH 2/2] Move ssh configuration to deploy-libcamera-docs.sh script Date: Sat, 16 May 2026 23:29:12 +0300 Message-ID: <20260516202912.383234-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260516202912.383234-1-laurent.pinchart@ideasonboard.com> References: <20260516202912.383234-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Job definitions in .gitlab-ci.yml are stored by Gitlab in jobs. This means that a new full pipeline needs to be run when making a change to the job, as re-running a failed job will not pick up changes to the job definition. To avoid this and help with development, move the ssh configuration script to the deploy-libcamera-docs.sh file. As the libcamera-ci repository is cloned freshly every time a job is run, changes to the script can be tested just by re-running the job. While at it, fix indentation in the rsync command. Signed-off-by: Laurent Pinchart --- .gitlab-ci/deploy-libcamera-docs.sh | 16 +++++++++++----- gitlab-ci.yml | 7 ------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci/deploy-libcamera-docs.sh b/.gitlab-ci/deploy-libcamera-docs.sh index 639fdf748d07..d25c8275adf5 100755 --- a/.gitlab-ci/deploy-libcamera-docs.sh +++ b/.gitlab-ci/deploy-libcamera-docs.sh @@ -12,12 +12,18 @@ source "$(dirname "$0")/lib.sh" libcamera_deploy_docs() { echo "Deploying libcamera docs for ${CI_COMMIT_REF_NAME}" + mkdir -p ~/.ssh + chmod 700 ~/.ssh + echo "${DEPLOY_KNOWN_HOSTS}" > ~/.ssh/known_hosts + eval $(ssh-agent -s) + echo "${DEPLOY_SSH_KEY_BASE64}" | base64 -d | ssh-add - + rsync -rlz --delete --chmod=Do=rx,Fo=r \ - --exclude .doctrees \ - --exclude .buildinfo \ - --exclude objects.inv \ - docs/ \ - "${DEPLOY_DESTINATION}/${CI_COMMIT_REF_NAME}" + --exclude .doctrees \ + --exclude .buildinfo \ + --exclude objects.inv \ + docs/ \ + "${DEPLOY_DESTINATION}/${CI_COMMIT_REF_NAME}" } run libcamera_deploy_docs diff --git a/gitlab-ci.yml b/gitlab-ci.yml index e3274ca56e20..427f2d2516dc 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -461,11 +461,4 @@ deploy-docs: needs: - job: build-docs script: - - | - mkdir -p ~/.ssh - chmod 700 ~/.ssh - echo "${DEPLOY_KNOWN_HOSTS}" > ~/.ssh/known_hosts - eval $(ssh-agent -s) - echo "${DEPLOY_SSH_KEY_BASE64}" | base64 -d | ssh-add - - - $CI_PROJECT_DIR/.gitlab-ci/deploy-libcamera-docs.sh