From patchwork Tue Mar 8 01:45:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 1602663 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ighhYLbX; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KCJ8039Ltz9sGD for ; Tue, 8 Mar 2022 12:46:08 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KCJ7y4rSwz30N4 for ; Tue, 8 Mar 2022 12:46:06 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ighhYLbX; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::52c; helo=mail-pg1-x52c.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ighhYLbX; dkim-atps=neutral Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KCJ7r1K01z2yLg for ; Tue, 8 Mar 2022 12:45:58 +1100 (AEDT) Received: by mail-pg1-x52c.google.com with SMTP id bc27so15098724pgb.4 for ; Mon, 07 Mar 2022 17:45:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LcnHLKlF5+6KccKPiC3FVTxLU/e7oiyhT25itYkWEiU=; b=ighhYLbX1qiYLtPsIs7OQUFyX909XLhCLk0CbzLJS6+PJOLnvhXREPFsDxv1t/6Es9 /TWtt47T9I+EokbrxE7fTZr5+7zpLLZbYtOmzP0r4DcuhxHy55jeBjJUI+RH1wynuc/h 3MVnxRou7tXaUKACguEJHT7kZiIELrGLRJ4bI67zKzhauRzPVoIass+9CsRZRdFzBcja EWtEh3GGCXQtM/tqbZjy1oqrIW73h0bzeOq807JPDLpLW6FY7CyX5ayR0UKDZFK3H761 YDi7A9DYvlG2IvMAdcOS8yoTR2azbGGDmdDknIBDzBPEAynozUonWZ7imONuwwqlFhER THUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LcnHLKlF5+6KccKPiC3FVTxLU/e7oiyhT25itYkWEiU=; b=peoMT9Y0FwjAPFs5N3r5IdAVkd8yFQTlRtzC/FFW7xnXFLExeqdNu6l8JfC55AXU9y aB8y2lKl1yFeXPIuHdzGe7ZgWVgDkQ75Li3l+3r2BXAqRPbXeNsWgd7JC0qCBJ5p5cVv RlZnoONTj1qmU3lID+5dc8VFUzC2MceOciK/yM46mtd2rQtJmBHGBeWnvFKbj/Hcehru z/q+9uh1Sfyc8Yd8pZFVcc6md66Il7oPZ6Jfi6Y4Y/wnQW/2w/KpgLK49B8x/fgWhUpu QdQsON6utBOCVn3iHMQBfZvBAA3VajaGm53Pbb6xCYnGYpc67Xb6omz8mVywJkvw4Umu SVew== X-Gm-Message-State: AOAM532AZuJ0iZ/a9wgYd0IuuMiRBXioROhMkY0nAabjEQafWxKoLq2o 06GNY6n14yxXOURZi5el3ObCz7hxlPOxPA== X-Google-Smtp-Source: ABdhPJwbAWop1/B+n8Rs358mgFZ+4y6bCXhgDGzISv+qjlCieZT4YaECsFiqFUSr7LDkpYgTOLqtnw== X-Received: by 2002:a65:6093:0:b0:373:9c75:19ec with SMTP id t19-20020a656093000000b003739c7519ecmr12486944pgu.539.1646703957540; Mon, 07 Mar 2022 17:45:57 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id f18-20020a056a001ad200b004bf321765dfsm17707718pfv.95.2022.03.07.17.45.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 17:45:56 -0800 (PST) From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 Mar 2022 12:15:42 +1030 Message-Id: <20220308014543.1308349-2-joel@jms.id.au> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220308014543.1308349-1-joel@jms.id.au> References: <20220308014543.1308349-1-joel@jms.id.au> MIME-Version: 1.0 Subject: [Skiboot] [PATCH v2 1/2] Makefile: Fix detection of cross compiler X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" The Fedora containers don't have 'which' installed. This means the detection of the cross compiler gives false negatives, leaving CROSS undefined. Instead use command -v, which outputs the path of the executable if it exists. Fixes: 9cd556ca1e5f ("Makefile: Search for distro-provided cross-compiler") Signed-off-by: Joel Stanley --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 625f212eaa99..f3942c442a84 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ ifdef CROSS_COMPILE endif ifneq ("$(ARCH)", "ppc64") ifneq ("$(ARCH)", "ppc64le") -ifneq ($(shell which powerpc64-linux-gcc 2> /dev/null),) +ifneq ($(shell command -v powerpc64-linux-gcc 2> /dev/null),) CROSS ?= powerpc64-linux- -else ifneq ($(shell which powerpc64le-linux-gcc 2> /dev/null),) +else ifneq ($(shell command -v powerpc64le-linux-gcc 2> /dev/null),) CROSS ?= powerpc64le-linux- -else ifneq ($(shell which powerpc64-linux-gnu-gcc 2> /dev/null),) +else ifneq ($(shell command -v powerpc64-linux-gnu-gcc 2> /dev/null),) CROSS ?= powerpc64-linux-gnu- -else ifneq ($(shell which powerpc64le-linux-gnu-gcc 2> /dev/null),) +else ifneq ($(shell command -v powerpc64le-linux-gnu-gcc 2> /dev/null),) CROSS ?= powerpc64le-linux-gnu- endif endif From patchwork Tue Mar 8 01:45:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 1602665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=PTx0AxAp; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KCJ8D4jwpz9sGD for ; Tue, 8 Mar 2022 12:46:20 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KCJ8C3grlz3bT0 for ; Tue, 8 Mar 2022 12:46:19 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=PTx0AxAp; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::62a; helo=mail-pl1-x62a.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=PTx0AxAp; dkim-atps=neutral Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KCJ7v37g1z2yLg for ; Tue, 8 Mar 2022 12:46:03 +1100 (AEDT) Received: by mail-pl1-x62a.google.com with SMTP id z3so7214069plg.8 for ; Mon, 07 Mar 2022 17:46:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mz7nOpIfzMNB+jpCgQGX48bfmW5KHA1hAFBJPTstLs8=; b=PTx0AxAplH/rie/oqcbWPuHCibtD+6+l4+pnSQ5ARwvmfRy06syIaPBe5mJ2FuflDH 1I1MFN67bp3FnfVErc9MLRFhU6FCi2kGHiQOromLB6w7ZgursUDmrxnhGq0JTqCk17yk 4GVm7vTiBQhy1/Fc2bhgHHAfod/AR3hyo2WpPGkFH55GhswEZGtxjRF2Xvtu8PicnYKm Z88tXmAJdyHOc657yBcysPehDAqK7gXoLyVs3QW4fIjVMaAQfE8z9Ah5eZmGgqgmTB/8 gffZ6kxt/DVLa2pElSu7OxJCrK40zOMHreol4IErgPS3nwgKVo4w6yu3itSqZCMLqv+M w2sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mz7nOpIfzMNB+jpCgQGX48bfmW5KHA1hAFBJPTstLs8=; b=7OgOdSWBgToqiqVillNVCgjFDZnTc0jcWp2ri63KU7hNz3bKnfPXM//4XBW7ysoKK6 S97qqMML4GGEMAMS3NQkX6IDPfn+aE464e3IeSk6x4cR8zME8BEr3e5D3ONZzoWUwfzs 84hcGbMMpu35Ku3Cl3kULbm2YZlpvOALZY7YzucwDKAi3In58Vdxy52YgO7ciTCWg4Sw F/5qUJU0rafp1KeQqbhG/sVzNGsiYP9Aj4fq2aSNSY09M1ZQOS8//5yWJANMHCN9AVsA 2BJ+u8z7UDR71cgLblSlC48swbDv5eBaOKCn31yLOzZnnXU57YJ/VFnzNNKKcmPrrpJv uejw== X-Gm-Message-State: AOAM531zF36RT5OBdsTPhddN3OAS7+xnTNhub3wyUqk62MsDWVGJBTYk Y+/R2C3OOuGXJwsCFrk0ImLUADSzIJ2yiQ== X-Google-Smtp-Source: ABdhPJyq6r+ZqoT53YBHG2mxu/54o9SimtY0l+xSpgAEFmM2p+Djak02FeAEZOnlFUd8JXH5HAVWjA== X-Received: by 2002:a17:902:ce91:b0:150:3f7:5096 with SMTP id f17-20020a170902ce9100b0015003f75096mr14776792plg.128.1646703961531; Mon, 07 Mar 2022 17:46:01 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id f18-20020a056a001ad200b004bf321765dfsm17707718pfv.95.2022.03.07.17.45.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 17:46:00 -0800 (PST) From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 Mar 2022 12:15:43 +1030 Message-Id: <20220308014543.1308349-3-joel@jms.id.au> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220308014543.1308349-1-joel@jms.id.au> References: <20220308014543.1308349-1-joel@jms.id.au> MIME-Version: 1.0 Subject: [Skiboot] [PATCH v2 2/2] github: Add workflow to build and deploy docs X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" This builds the gcov coverage report and the skiboot docs on the Github hosted runner, without using a container. Remove the CROSS= definition from build-docs.sh to allow the makefile detect which cross compiler is installed, instead of hardcoding the non-le variant. This is a simplification from the previous docs build, which used the containers. However the containers have since been re-worked and no longer leave the build artifacts on the host system. The github action used for deploying seems to be the most commonly used: https://github.com/JamesIves/github-pages-deploy-action Signed-off-by: Joel Stanley --- .github/workflows/build-docs.yml | 30 ++++++++++++++++++++++++++++++ opal-ci/build-docs.sh | 1 - 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-docs.yml diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml new file mode 100644 index 000000000000..242f2002e5cc --- /dev/null +++ b/.github/workflows/build-docs.yml @@ -0,0 +1,30 @@ +name: Generate and deploy documentation + +on: + push: + branches: + - master + +jobs: + docs-build-and-deploy: + + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Install apt dependencies + run: | + sudo apt install -qq build-essential gcc-powerpc64le-linux-gnu git lcov \ + device-tree-compiler libssl-dev libmbedtls-dev \ + python3-sphinx python3-recommonmark + + - name: Generate docs and coverage report + run: ./opal-ci/build-docs.sh + + - name: Deploy docs + uses: JamesIves/github-pages-deploy-action@v4.2.5 + with: + branch: gh-pages + folder: doc/_build/ghpages diff --git a/opal-ci/build-docs.sh b/opal-ci/build-docs.sh index 4125f33d1a86..05e6e7318cb2 100755 --- a/opal-ci/build-docs.sh +++ b/opal-ci/build-docs.sh @@ -5,7 +5,6 @@ set -e set -vx MAKE_J=$(grep -c processor /proc/cpuinfo) -export CROSS="ccache powerpc64-linux-gnu-" make -j${MAKE_J} SKIBOOT_GCOV=1 coverage-report