From owner-freebsd-git@freebsd.org Wed Sep 23 14:29:25 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 541723FB402 for ; Wed, 23 Sep 2020 14:29:25 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxLCm72YHz4t5N; Wed, 23 Sep 2020 14:29:24 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f68.google.com with SMTP id 60so19141330otw.3; Wed, 23 Sep 2020 07:29:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=3KK3WkEKL4IwCib/EhN7Xw5La55rmyylN8pt/n8j1To=; b=Gn6Kw4j4v4aSntmUDd7JofQUN42ZLF49OGkWoZIpVv65N9CpAEzeV3EIIXyGGHv/SZ nrJLsydm+fESfz/GRCZi3jOt42WesGukh5Py85jmuOvdHx71awZWtW+nPwDjfE/2u3Bs ox8dvAg7HG7HXa/0JRLIEqAYuTuicy+N5x+w0MrUQ8l/LSYtwA/5gzzd43T8ZwT8Paxl 93fXwlb2iN3OUe2Nj34S4Yhpx3HNtxpr92SFFJcOvXnBr71IIMG0UEA5yxQqMLzhPyaI puEhA2gbd8SQanfoflqUMEPflSW5klLRmrbx+hKLvt0lUKebyW2lnB8zfy7m59z1L6fO zJFA== X-Gm-Message-State: AOAM533UNYpKCk/hbN2S/Me+nPoW0ui5Fo6yATmu3ZlWeRq9Mj5bmkz/ 3PSw5eARyzqxuX0hJYGbfsTlzDQAUHzyXCjjOtIa8K6quJ8= X-Google-Smtp-Source: ABdhPJxyomdWjPH1KI3PEtcTBZBFSorlFfA3A6ZyB9blVqFgzJUvd3wHI+LTkV9BsKdyjCsCUI1ENrbRYWDwBQIJ0Xo= X-Received: by 2002:a9d:3983:: with SMTP id y3mr5908174otb.71.1600871362136; Wed, 23 Sep 2020 07:29:22 -0700 (PDT) MIME-Version: 1.0 References: <202009231254.08NCsbvl097012@repo.freebsd.org> In-Reply-To: <202009231254.08NCsbvl097012@repo.freebsd.org> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Wed, 23 Sep 2020 16:29:10 +0200 Message-ID: Subject: Re: svn commit: r366074 - in head/.github: . workflows To: Alex Richardson , Ed Maste Cc: src-committers@freebsd.org, freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4BxLCm72YHz4t5N X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 14:29:25 -0000 This broke pushing to github, so the converter is currently halted ! [remote rejected] trunk -> svn_head (refusing to allow an integration to create or update workflow `.github/workflows/cross-bootstrap-tools.yml`) error: failed to push some refs to 'base.github.com:freebsd/freebsd.git' Error in pushing to github Do you know why? On Wed, Sep 23, 2020 at 2:54 PM Alex Richardson wrote: > > Author: arichardson > Date: Wed Sep 23 12:54:37 2020 > New Revision: 366074 > URL: https://svnweb.freebsd.org/changeset/base/366074 > > Log: > Add github CI for testing cross-building from Linux and macOS > > This builds the kernel-toolchain target and an amd64 GENERIC kernel on > Ubuntu 18.04, 20.04 and the latest macOS to ensure that new changes > don't regress building on non-FreeBSD hosts. > > Reviewed By: emaste, lwhsu > Differential Revision: https://reviews.freebsd.org/D26512 > > Added: > head/.github/ > head/.github/workflows/ > head/.github/workflows/cross-bootstrap-tools.yml (contents, props changed) > > Added: head/.github/workflows/cross-bootstrap-tools.yml > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/.github/workflows/cross-bootstrap-tools.yml Wed Sep 23 12:54:37 2020 (r366074) > @@ -0,0 +1,35 @@ > +name: Cross-build CI > + > +on: > + push: > + branches: [ master ] > + pull_request: > + branches: [ master ] > + > +jobs: > + build: > + name: ${{ matrix.os }} > + runs-on: ${{ matrix.os }} > + strategy: > + matrix: > + os: [ubuntu-18.04, ubuntu-20.04, macOS-latest] > + > + steps: > + - uses: actions/checkout@v2 > + - name: install LLVM+libarchive (Ubuntu) > + run: | > + wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh > + chmod +x /tmp/llvm.sh > + sudo /tmp/llvm.sh 11 > + sudo apt install -y libarchive-dev > + echo "::set-env name=EXTRA_MAKE_ARGS::--cross-bindir=/usr/lib/llvm-11/bin" > + if: ${{ startsWith(matrix.os, 'ubuntu') }} > + - name: install LLVM+libarchive (macOS) > + run: brew install llvm coreutils libarchive xz > + if: ${{ startsWith(matrix.os, 'macOS') }} > + - name: create build dir > + run: rm -rf ../build && mkdir -p ../build > + - name: make kernel-toolchain > + run: env MAKEOBJDIRPREFIX=`realpath ../build` ./tools/build/make.py $EXTRA_MAKE_ARGS TARGET=amd64 TARGET_ARCH=amd64 kernel-toolchain -s -j$(nproc) > + - name: make buildkernel > + run: env MAKEOBJDIRPREFIX=`realpath ../build` ./tools/build/make.py $EXTRA_MAKE_ARGS TARGET=amd64 TARGET_ARCH=amd64 KERNCONF=GENERIC NO_MODULES=yes buildkernel -s -j$(nproc) From owner-freebsd-git@freebsd.org Wed Sep 23 16:23:16 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C05743FE28E for ; Wed, 23 Sep 2020 16:23:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4BxNl84197z3YZC for ; Wed, 23 Sep 2020 16:23:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 89A4B3FE28D; Wed, 23 Sep 2020 16:23:16 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 897003FE28C for ; Wed, 23 Sep 2020 16:23:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxNl71cKmz3YJT for ; Wed, 23 Sep 2020 16:23:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82c.google.com with SMTP id g3so331820qtq.10 for ; Wed, 23 Sep 2020 09:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=gNT/ps41iTcL175n30pscPke6wwTg25KAbuW4uXZcOg=; b=f6Vpfm6HQVBX73xRGJznNuBfS9A1ft4gRd+dwxk9zG42afNxA2stf4NO56XbqlkfWp UBHRkKAR6Je+u9poRNQf6ueN4VrqfPZgzp0LjO+o5F2T8i1OEqKAEyK0rB3v+iG38oHC 2u2lNb9/Xtra05N9tDPFFO4lvDHTfpBM+PkpN9U/tZM0ekYfmkM1Y9GFVUNrJMcOFbX+ vlu2NPYr8ywpy/YrD+CXXtYmseUwfZ1hy9FquV5b8yIYaI8C3x/DsHfJiC5RRfLsOUE3 1onh/sH3EtUafuEZBIruoUJj9HXYRR/4rTpCRe5NHzLzimrVLO13Y/Kwby0aY2T3Ug90 kOIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=gNT/ps41iTcL175n30pscPke6wwTg25KAbuW4uXZcOg=; b=CWPdapcAG3m2jGwl/iaIlmqfvhjbrj8gf/NWj0aonTPLtPIAaVaD7LM7CsozSBlbpx WwfnsS8jSzjWidA0kv+zfSvnFR/7GuE+0D346Ec92K1PRhKvcoEZaotVwkGZOf/fZWcI tdqcs61NfVN/gPV1pFz+2jlORzK17m1k+GeUN827r0AWfJlmm2YSGe7gdkwkjgFGm/Bs fcar8AOl5pfAZfnncq3MeqgF+tn4P7LadvJHQTYoMf+EhgLyZayDhMtC59nlcY65yPTV 5756n10nOX+cJaREENGvYRlGyRCg3F7WZpsg/ktT46BfZiHgz8cnuec8HBDzIZ16664o bbkQ== X-Gm-Message-State: AOAM533PBr8GeamFSbIir2ybSXpTVKRl7IqvLunLlEct+6DQqd1y+vuh mvXwr/ZQk0L4G553+GN9HZ9+woCAGdIvI7OpNd3nq+iBXP1BmpCT X-Google-Smtp-Source: ABdhPJxfhbtc7lf3K8crrG1y1TQYZTj/AyfE8wMLWQjbd8q1vbQNF5Drkb/8bF0N0GJ3TfWrNJDRBpSKNrdtWzT7iEE= X-Received: by 2002:ac8:d47:: with SMTP id r7mr869669qti.32.1600878190256; Wed, 23 Sep 2020 09:23:10 -0700 (PDT) MIME-Version: 1.0 From: Warner Losh Date: Wed, 23 Sep 2020 10:22:59 -0600 Message-ID: Subject: revisions in the new repo To: git@freebsd.org X-Rspamd-Queue-Id: 4BxNl71cKmz3YJT X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=f6Vpfm6H; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82c) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-0.64 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.53)[-0.533]; RCVD_COUNT_TWO(0.00)[2]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.76)[-0.761]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; DMARC_NA(0.00)[bsdimp.com]; NEURAL_SPAM_SHORT(0.66)[0.659]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82c:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 16:23:16 -0000 How do I see the SVN revisions in the new repo? I tried git log --show-notes, but no joy. I'm fetching the notes, I thought: [remote "origin"] url = https://cgit-beta.freebsd.org/src.git fetch = +refs/heads/*:refs/remotes/origin/* fetch = +refs/notes/*:refs/gitbeta/notes/* with/without gitbeta in the notes line what am I doing wrong? Warner From owner-freebsd-git@freebsd.org Wed Sep 23 18:15:19 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 40EA64221BC for ; Wed, 23 Sep 2020 18:15:19 +0000 (UTC) (envelope-from olivier.freebsd@free.fr) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4BxRDR0PB9z41cf for ; Wed, 23 Sep 2020 18:15:19 +0000 (UTC) (envelope-from olivier.freebsd@free.fr) Received: by mailman.nyi.freebsd.org (Postfix) id 0BC2D4221BB; Wed, 23 Sep 2020 18:15:19 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0A648422169; Wed, 23 Sep 2020 18:15:19 +0000 (UTC) (envelope-from olivier.freebsd@free.fr) Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxRDQ05S1z41ZL; Wed, 23 Sep 2020 18:15:17 +0000 (UTC) (envelope-from olivier.freebsd@free.fr) Received: from ravel.localnet (unknown [90.116.216.55]) (Authenticated sender: olivier.freebsd@free.fr) by smtp2-g21.free.fr (Postfix) with ESMTPSA id 2637D2004CF; Wed, 23 Sep 2020 20:15:07 +0200 (CEST) From: Olivier Certner To: Warner Losh Cc: git@freebsd.org, freebsd-git@freebsd.org Subject: Re: revisions in the new repo Date: Wed, 23 Sep 2020 20:15:07 +0200 Message-ID: <2529100.ffieBuXMo3@ravel> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4BxRDQ05S1z41ZL X-Spamd-Bar: ++++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of olivier.freebsd@free.fr has no SPF policy when checking 212.27.42.2) smtp.mailfrom=olivier.freebsd@free.fr X-Spamd-Result: default: False [4.19 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[free.fr]; RWL_MAILSPIKE_GOOD(0.00)[212.27.42.2:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[free.fr]; CTE_CASE(0.50)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:12322, ipnet:212.27.32.0/19, country:FR]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_SPAM_SHORT(1.22)[1.219]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[free.fr]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.41)[0.414]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_SPAM_LONG(0.66)[0.655]; RCVD_IN_DNSWL_NONE(0.00)[212.27.42.2:from]; R_SPF_NA(0.00)[no SPF record]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git,git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 18:15:19 -0000 Hi, Notes should have been fetched indeed. Do you see something when typing: `git log --notes=refs/gitbeta/notes/commits` ? I've fetched notes with `git fetch origin refs/notes/*:refs/notes/origin/*` and I indeed can see them with: `git log --notes=origin/commits` But since you have chosen a non-standard ref path (according to `git help notes`), you have to be more explicit and use a full path with `--notes`. When you have found something that works, you'll be able to fill `core.notesRef` or `notes.displayRef` in your config to avoid typing the path repeatedly. Regards. -- Olivier Certner From owner-freebsd-git@freebsd.org Wed Sep 23 19:20:22 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 83004423E5A for ; Wed, 23 Sep 2020 19:20:22 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxSgV1671z4Cqp; Wed, 23 Sep 2020 19:20:21 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f49.google.com with SMTP id a2so779038otr.11; Wed, 23 Sep 2020 12:20:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=fLo2TfzWyQ4evGGVQne1KAb5kAvZlR9m2qunXQhPXvI=; b=FJxpzy91Tg95pbAQ4SsHTMXFn6CHrz3tHJ0RqzAkp/G042ZV14NMteaBO3iUdrFotE 1SKRVR7aPUzzZC9fGaSY7KHz1ItupnP9bVQheoPm30L09ImAaRCIWhavkgfBShtIuwGt +W8Lc+sHMpYl6gbJ1Cbz/K77AsCLdPpGOf+U5daEenteOKMB0V5BQOYNbnuHT4vDDwym vcq9czwAjCRRnJXV6AduGvO3dYCZE159WYnsBII2AieWOW1S1bQylbY+TUo/fq0NzHTm 8NW1jCRya3oN/3xOvLnzE1rG1t7moXva1sfbqvLYTqHqHUL2zSg3RunP3V15d+Vvb/FT t+wQ== X-Gm-Message-State: AOAM530wPxmnOVYwvp5bpQVof+5Mg+LuG4kvEaRKdRQtOBK+5+VsSNJp x/NTgAp+zvpWcUjyBoWhCFzDO6ji4MmrY0bW8ILCQ0P8S18= X-Google-Smtp-Source: ABdhPJwfTipVf38jTANY1muGyAYdVAdhnqRc1ILQj4sDuLS+YhFzBzcEAA14p9OQ36oN7A9RRZQxIkZDXDzBV0rWv2Q= X-Received: by 2002:a9d:3983:: with SMTP id y3mr723799otb.71.1600888820426; Wed, 23 Sep 2020 12:20:20 -0700 (PDT) MIME-Version: 1.0 References: <202009231254.08NCsbvl097012@repo.freebsd.org> <17915865-DF2F-473D-AB52-4C69D7DB706F@freebsd.org> In-Reply-To: <17915865-DF2F-473D-AB52-4C69D7DB706F@freebsd.org> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Wed, 23 Sep 2020 21:20:08 +0200 Message-ID: Subject: Re: svn commit: r366074 - in head/.github: . workflows To: Jessica Clarke Cc: Alex Richardson , Ed Maste , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4BxSgV1671z4Cqp X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 19:20:22 -0000 On Wed, Sep 23, 2020 at 4:33 PM Jessica Clarke wrote: > > On 23 Sep 2020, at 15:29, Ulrich Sp=C3=B6rlein wrote: > > > > This broke pushing to github, so the converter is currently halted > > > > ! [remote rejected] trunk -> svn_head (refusing to allow an > > integration to create or update workflow > > `.github/workflows/cross-bootstrap-tools.yml`) > > error: failed to push some refs to 'base.github.com:freebsd/freebsd.git= ' > > Error in pushing to github > > > > Do you know why? > > The authorisation token used for the converter needs to have the "workflo= w" > scope added. All there is is a deploy key (SSH) on the repository and there's no way to give it more or less access. Only write access AFAICS. Uli From owner-freebsd-git@freebsd.org Wed Sep 23 19:38:49 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D1276424B32 for ; Wed, 23 Sep 2020 19:38:49 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxT4k1mX6z4FpL; Wed, 23 Sep 2020 19:38:46 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-ej1-f51.google.com with SMTP id gr14so1280701ejb.1; Wed, 23 Sep 2020 12:38:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=8CYlWHylRe4t69Ekq6v5LMbCm8PGe46P0ZfaS+ocOEI=; b=BnnUMMV/SP7k9feJRyRbaKa3tHElFAaFzwui8hnzVc46A+qhk4tNUlvZQjadhmPIHu t4SOwX9x3SYku5xqPXjYJwaBXTa9L8+nVLuyKkNOH3X/GqE62rQPUg7UPn89rGBH/O4X x8yHyCpQJfpMGeciUedHbxDXvYslVPt/KHYGctzRnhySjQp1cYQDU5BzU39vhUCBw4qX 8VLFex72jmNDijkNWJq93cjhiINf0sMkZpW5Zll3md8iNaYr1cxZgN9bkGyr+G8UQhVe MdhORDO9v6c32VV8EL/IOVcxZU4ioFkeHHbmV7ktpY8yuSqUk5R6ebZIGd6J3FDav/dA xpQg== X-Gm-Message-State: AOAM532ilLYSsGUIfwzN5b3poPdQx1qpOPmp10XGVB+sl/MuZJfkFQy0 tTGaIK/huGoK77DLhOvyW9aR48R3wj0yFg== X-Google-Smtp-Source: ABdhPJy/8jyqKkAetP6P5/BuSs68gCfgCkZ0WIrxlEmXvYq3S5MU45QgVmmY6ar0sn2Yj4jMMSuxrQ== X-Received: by 2002:a17:906:d9da:: with SMTP id qk26mr1129630ejb.435.1600889923784; Wed, 23 Sep 2020 12:38:43 -0700 (PDT) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com. [209.85.221.54]) by smtp.gmail.com with ESMTPSA id gw6sm721247ejb.47.2020.09.23.12.38.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Sep 2020 12:38:43 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id z1so1293948wrt.3; Wed, 23 Sep 2020 12:38:43 -0700 (PDT) X-Received: by 2002:a5d:5751:: with SMTP id q17mr1223003wrw.409.1600889923167; Wed, 23 Sep 2020 12:38:43 -0700 (PDT) MIME-Version: 1.0 References: <202009231254.08NCsbvl097012@repo.freebsd.org> <17915865-DF2F-473D-AB52-4C69D7DB706F@freebsd.org> In-Reply-To: From: Alexander Richardson Date: Wed, 23 Sep 2020 20:38:31 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r366074 - in head/.github: . workflows To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Jessica Clarke , Ed Maste , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4BxT4k1mX6z4FpL X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 19:38:51 -0000 On Wed, 23 Sep 2020 at 20:20, Ulrich Sp=C3=B6rlein wrote: > > On Wed, Sep 23, 2020 at 4:33 PM Jessica Clarke wrote= : > > > > On 23 Sep 2020, at 15:29, Ulrich Sp=C3=B6rlein wrote: > > > > > > This broke pushing to github, so the converter is currently halted > > > > > > ! [remote rejected] trunk -> svn_head (refusing to allow an > > > integration to create or update workflow > > > `.github/workflows/cross-bootstrap-tools.yml`) > > > error: failed to push some refs to 'base.github.com:freebsd/freebsd.g= it' > > > Error in pushing to github > > > > > > Do you know why? > > > > The authorisation token used for the converter needs to have the "workf= low" > > scope added. > > All there is is a deploy key (SSH) on the repository and there's no > way to give it more or less access. Only write access AFAICS. > > Uli Sorry about the breakage! I did not expect this to cause any problems. Just to be sure, are GitHub actions enabled for the repository? Maybe the repository level setting that disables the actions is set? The URL should be https://github.com/freebsd/freebsd/settings/actions. Is it possible to manually push the latest changes using your personal user name + SSH key? Alex From owner-freebsd-git@freebsd.org Wed Sep 23 20:20:37 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5ECC142582B for ; Wed, 23 Sep 2020 20:20:37 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxV110RZQz4JcB; Wed, 23 Sep 2020 20:20:36 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f47.google.com with SMTP id a2so943280otr.11; Wed, 23 Sep 2020 13:20:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=jo3KbMlWkCbITf6EU72oCwQ5DnOt3fau4szYs3giBx0=; b=JNZA0GEGVU1Z8zvEo0ptKhkdoueYjd2mvR+qu5mnm7BpM38jfcEKWf1KpcFFuwiJ44 ykIFQiKYHCsDkA+vWeCQiY+dS8tkYAT/27OlrtcZMEEuFqGzeoQEPnUSFtnZXyDWEnKU KJuYAHDCHw5Nx9AeRGGWCtCDSw62Z0yQ8nHRYk5CNpYwSsUitH9twJdQ3Dsx+e9+rftV BZiNx03J3psmWVwhTDb2nVqYSlX0WjUcIjKg8H02EWD9jY67hDQsMVpMfOms2yg1HfMb bUNLTTAC6dRNKRlrtT01Hge534YD9mnH/fW+erJTNcTe0I9psdrw7me5ZVC6rRbdpZAV mu3A== X-Gm-Message-State: AOAM530+aLOwaU/iod8IpY+j4xAsLLwISP4eF1By+eVCQggElL4YNvu5 t58+gKXToGxh1yn47VwJ2IZJt+kN1PGGpuDnXSm1sJiXIs8= X-Google-Smtp-Source: ABdhPJz43H48ttNAc4/z69rT9XsWjVbq1i209mQezKMLuOoZxfve6RfoUgCCf3arJ9KvZt1akvzl/68ACjcdr4ZjiJI= X-Received: by 2002:a9d:3983:: with SMTP id y3mr858559otb.71.1600892435590; Wed, 23 Sep 2020 13:20:35 -0700 (PDT) MIME-Version: 1.0 References: <202009231254.08NCsbvl097012@repo.freebsd.org> <17915865-DF2F-473D-AB52-4C69D7DB706F@freebsd.org> In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Wed, 23 Sep 2020 22:20:23 +0200 Message-ID: Subject: Re: svn commit: r366074 - in head/.github: . workflows To: Alexander Richardson Cc: Jessica Clarke , Ed Maste , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4BxV110RZQz4JcB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2020 20:20:37 -0000 On Wed, Sep 23, 2020 at 9:38 PM Alexander Richardson wrote: > > On Wed, 23 Sep 2020 at 20:20, Ulrich Sp=C3=B6rlein wrot= e: > > > > On Wed, Sep 23, 2020 at 4:33 PM Jessica Clarke wro= te: > > > > > > On 23 Sep 2020, at 15:29, Ulrich Sp=C3=B6rlein wrot= e: > > > > > > > > This broke pushing to github, so the converter is currently halted > > > > > > > > ! [remote rejected] trunk -> svn_head (refusing to allow an > > > > integration to create or update workflow > > > > `.github/workflows/cross-bootstrap-tools.yml`) > > > > error: failed to push some refs to 'base.github.com:freebsd/freebsd= .git' > > > > Error in pushing to github > > > > > > > > Do you know why? > > > > > > The authorisation token used for the converter needs to have the "wor= kflow" > > > scope added. > > > > All there is is a deploy key (SSH) on the repository and there's no > > way to give it more or less access. Only write access AFAICS. > > > > Uli > > Sorry about the breakage! I did not expect this to cause any problems. > Just to be sure, are GitHub actions enabled for the repository? Maybe > the repository level setting that disables the actions is set? The URL > should be https://github.com/freebsd/freebsd/settings/actions. > > Is it possible to manually push the latest changes using your personal > user name + SSH key? > > Alex actions are enabled under that URL yes. And I don't have write access with my key there's just 1 key that's allowed to push and even adding a new key I can only flip the "write" bit, nothing else. I'll try to create the action in the UI now From owner-freebsd-git@freebsd.org Thu Sep 24 04:50:09 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C3C023EC980 for ; Thu, 24 Sep 2020 04:50:09 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits)) (Client CN "anubis.delphij.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxjJx154nz3dRX; Thu, 24 Sep 2020 04:50:08 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from odin.corp.delphij.net (unknown [IPv6:2601:646:8600:58ba:a5b2:57db:ef6a:f4cc]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id 065C4462E2; Wed, 23 Sep 2020 21:50:07 -0700 (PDT) From: Xin Li Subject: Re: New FreeBSD snapshots available: main (20200903 c122cf32f2a) Reply-To: d@delphij.net To: freebsd-git@freebsd.org Cc: re@FreeBSD.org References: <20200903150245.GS61041@FreeBSD.org> Message-ID: Date: Wed, 23 Sep 2020 21:50:07 -0700 User-Agent: Thunderbird MIME-Version: 1.0 In-Reply-To: <20200903150245.GS61041@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ekD6531lGvH6CthpE9f8CnhQa86FqDiYy" X-Rspamd-Queue-Id: 4BxjJx154nz3dRX X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.72 / 15.00]; HAS_REPLYTO(0.00)[d@delphij.net]; RCVD_VIA_SMTP_AUTH(0.00)[]; XM_UA_NO_VERSION(0.01)[]; R_SPF_ALLOW(-0.20)[+mx:c]; HAS_ATTACHMENT(0.00)[]; TO_DN_NONE(0.00)[]; DKIM_TRACE(0.00)[delphij.net:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[delphij.net,reject]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~]; ASN(0.00)[asn:6939, ipnet:64.62.128.0/18, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.91)[-0.906]; R_DKIM_ALLOW(-0.20)[delphij.net:s=m7e2]; FREEFALL_USER(0.00)[delphij]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.03)[-1.029]; MIME_GOOD(-0.20)[multipart/signed,multipart/mixed,text/plain]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; NEURAL_SPAM_SHORT(0.31)[0.307]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2020 04:50:09 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ekD6531lGvH6CthpE9f8CnhQa86FqDiYy Content-Type: multipart/mixed; boundary="a4uJaYp6LNZwYV2T8nRR6qyMx3wfUKbQP"; protected-headers="v1" From: Xin Li Reply-To: d@delphij.net To: freebsd-git@freebsd.org Cc: re@FreeBSD.org Message-ID: Subject: Re: New FreeBSD snapshots available: main (20200903 c122cf32f2a) References: <20200903150245.GS61041@FreeBSD.org> In-Reply-To: <20200903150245.GS61041@FreeBSD.org> --a4uJaYp6LNZwYV2T8nRR6qyMx3wfUKbQP Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable [resent to a public mailing list for the record] I have successfully completed an update from 12.1-RELEASE (official) to 13.0-20200910 (from git) for amd64 with no significant issue discovered. A few observations: 1) running freebsd-update install twice without rebooting after the first would severely damage the installation, because the old kernel lacks some system calls and eventually rendered /bin/sh unusable, even after a reboot. Following installation instructions strictly will work just fine. We may want to say somewhere in the release notes or announcement, that the user should really do reboot after the first `freebsd-update install` for the upgrade. 2) Both etcupdate and freebsd-update have some problem handling /etc/motd (with a recent change, /etc/motd become a symlink). freebsd-update will ask if the file should be deleted (I kinda wanted it to leave the file as-is and let rc.d scripts to perform the migration). 3) The lack of $FreeBSD$ expansion doesn't seem to cause problems for either of freebsd-update and etcupdate. Cheers, --a4uJaYp6LNZwYV2T8nRR6qyMx3wfUKbQP-- --ekD6531lGvH6CthpE9f8CnhQa86FqDiYy Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEceNg5NEMZIki80nQQHl/fJX0g08FAl9sJX8FAwAAAAAACgkQQHl/fJX0g0/m 2w/+P4IIbya+Ea/IfmVtZYa/xbSQpYX/6b1ZipXI/UnLbbpYFvBd44CoKmK/iioVuhWKBqTPdAZg elkCv8FbxtLKjM3GnOfbjuGFZU90lgA2OuanVMgQ8vCbtEX8Z+ifK1HYgx/gnhAf9JNBzM153yZi s1ursl+6zeD0Yb/8nirkkC2N5Lc3gy1mBWp32FeIIOlYZOTQc+Lo1J5YrQZ62zB/wc58wcwPpRxS 2BoNOBKKBGyUesOasM3JZNQ1VukpmFNB8/kLQyXqtATClSPd1fQWjBeHn9ewLHB1BU20YdppRPSO lIOj88fxdNmAMuK9QzVqxcQt3CGkOgJT79h01mM2fV7gPE9VhVJ6yex7xCkPvGpqdF7xTuBE23Nj QMS9EW6ywvdD5oyZxUl5GEcQJ+cuNRnltw4BGXKCBuCaffPMDitN0/gBcTR8kmz9tnWef/5U3ZcS Cew0JA2RXvMND5H2lmXYaOXvRPu8Q0ED40SOVudFZyP1hCjTH98dxyN6CkcB4NQCekoswnN9xJAS LOcBND0LABt0AnC5XRUfGDZKhqzbCPWjEaN/DW4PqH0K+U/2gvCe11HGK1Qw970c0DTU9DNxeM/m jgX0MOwEREXQ3mu7u5YOWslSXjO+fat/sEFnC2fYoKvsxLR26rC76Fryo62/jnszjUpn358pnWI/ Lnw= =5+Gt -----END PGP SIGNATURE----- --ekD6531lGvH6CthpE9f8CnhQa86FqDiYy-- From owner-freebsd-git@freebsd.org Thu Sep 24 07:33:10 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F23073EF850 for ; Thu, 24 Sep 2020 07:33:10 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oo1-f47.google.com (mail-oo1-f47.google.com [209.85.161.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bxmx15LLbz43gV; Thu, 24 Sep 2020 07:33:09 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-oo1-f47.google.com with SMTP id w25so528912oos.10; Thu, 24 Sep 2020 00:33:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ndrm9WzhkTI7Cm883UmBXUndQeSQAxlAVd7xjIDvyMY=; b=aerGE3NMHyahoz3uq5hM8boe1n0heq1pCXrEeS0C0bt/WwLCFhbBcxJMkZ0e2YipO6 X2ToAigMNSbXIOaf2wSFEzqUejnbYEdFBGMI+fXnpNjBgbkEkzT9vl1DidV8zxouwSES UJQaF003+ghPp5mToDgFJIXxJ+/Zy6fpgDZB2OJP9Y4kdNzAF8iSO6Jlgl6+ToF/p6eT qigAJ15TQF6v6e7KAeFBpydCcHVgVPWMPoqcMY3/V35V0kaSWWtbLCOgxws9MytJK5xA L3f0PPp8cgUAFMNE12ByxOwXCn9xA0oqvAcZfZRGr/f7Eyi15mOddrArmHp4Hkryn82D sB6g== X-Gm-Message-State: AOAM532G7i2q+R0/JgM8T9Q9nfIqEE2+REHEl3UXrJiqdA2Vwvy2pDNz VdQMn8vTcl2vCTm1JGKKqS3eChbvosgYv3/505whEo4Re/s= X-Google-Smtp-Source: ABdhPJweUKaEdtbqitq2Tml/BmsBk6asAFJDaHxkQiCT95x6nVsNcB1Z1XLKxUYRD3PEESN9kQZP9SL7X4+KybHZOiw= X-Received: by 2002:a4a:d38c:: with SMTP id i12mr2362553oos.81.1600932788069; Thu, 24 Sep 2020 00:33:08 -0700 (PDT) MIME-Version: 1.0 References: <202009231254.08NCsbvl097012@repo.freebsd.org> <17915865-DF2F-473D-AB52-4C69D7DB706F@freebsd.org> In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Thu, 24 Sep 2020 09:32:56 +0200 Message-ID: Subject: Re: svn commit: r366074 - in head/.github: . workflows To: Alexander Richardson Cc: Jessica Clarke , Ed Maste , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Bxmx15LLbz43gV X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.161.47 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-0.54 / 15.00]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; DMARC_NA(0.00)[freebsd.org]; RWL_MAILSPIKE_GOOD(0.00)[209.85.161.47:from]; URI_COUNT_ODD(1.00)[5]; NEURAL_HAM_LONG(-0.89)[-0.889]; NEURAL_HAM_MEDIUM(-0.15)[-0.154]; NEURAL_HAM_SHORT(-0.49)[-0.492]; RCVD_IN_DNSWL_NONE(0.00)[209.85.161.47:from]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2020 07:33:11 -0000 I created the exact same workflow via the github UI (creating a brand new commit on master) and then force-pushed over it, that seems to have gotten it unstuck). Now where can one see these workflows in action and how are they triggered? Under https://github.com/freebsd/freebsd/actions?query=3Dworkflow%3A%22Cross-buil= d+CI%22 I see them taking only 10min? Is that true for a whole buildkernel? What machines are these running on? How is this being paid for? On Wed, Sep 23, 2020 at 10:20 PM Ulrich Sp=C3=B6rlein wro= te: > On Wed, Sep 23, 2020 at 9:38 PM Alexander Richardson > wrote: > > > > On Wed, 23 Sep 2020 at 20:20, Ulrich Sp=C3=B6rlein wr= ote: > > > > > > On Wed, Sep 23, 2020 at 4:33 PM Jessica Clarke > wrote: > > > > > > > > On 23 Sep 2020, at 15:29, Ulrich Sp=C3=B6rlein wr= ote: > > > > > > > > > > This broke pushing to github, so the converter is currently halte= d > > > > > > > > > > ! [remote rejected] trunk -> svn_head (refusing to allow = an > > > > > integration to create or update workflow > > > > > `.github/workflows/cross-bootstrap-tools.yml`) > > > > > error: failed to push some refs to 'base.github.com: > freebsd/freebsd.git' > > > > > Error in pushing to github > > > > > > > > > > Do you know why? > > > > > > > > The authorisation token used for the converter needs to have the > "workflow" > > > > scope added. > > > > > > All there is is a deploy key (SSH) on the repository and there's no > > > way to give it more or less access. Only write access AFAICS. > > > > > > Uli > > > > Sorry about the breakage! I did not expect this to cause any problems. > > Just to be sure, are GitHub actions enabled for the repository? Maybe > > the repository level setting that disables the actions is set? The URL > > should be https://github.com/freebsd/freebsd/settings/actions. > > > > Is it possible to manually push the latest changes using your personal > > user name + SSH key? > > > > Alex > > actions are enabled under that URL yes. And I don't have write access > with my key there's just 1 key that's allowed to push and even adding a n= ew > key I can only flip the "write" bit, nothing else. > > I'll try to create the action in the UI now > From owner-freebsd-git@freebsd.org Thu Sep 24 08:51:46 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1150B3F118F for ; Thu, 24 Sep 2020 08:51:46 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bxpgj2fhrz47Y5; Thu, 24 Sep 2020 08:51:45 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id gr14so3414228ejb.1; Thu, 24 Sep 2020 01:51:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=97KIy8v6MeMSmb4Hx3B3Md2YZbZtV4cx77/rYYic4Q0=; b=SYVEE/2px+EzCI5XD1a+GmsY1GqXxpW6YfDyygnCRja5nwfYCpcWABs2SRmzeDvW+i hnDeLSEXKUuH1xMgV8JMIwlI3qaip6kB51AONyr+Nzo2G/ClZaok01Wo+147FI7PVAof XCUSrXxhLfEgleJH8N66m6zFTW7h2nkRyOifeNXazaPEqjZ5uBH175235ggV39e5aMBx maulBLuABCrfLWQm8iRtx4pHgrduaQwVOpF0xslPc/KD275LtncjV6jlcZUqds6iXS9o 4uZfBkZ1AwszlYPr2Zao/cJ/l1Y0T5C/xjS5qj3p7ncZz5Fg9qiYWTUiF9FDyC+ydr5N BQqg== X-Gm-Message-State: AOAM531gig9B46ACZn5DF+FuHcK5pzU32Py9fda5PMqj/ljdEQj33p36 uWXlGcDGVHJ+gXWv9ituJjdoZfQJ9kZR/A== X-Google-Smtp-Source: ABdhPJxpP4m4OlIyG+hhymoSZn/PmX+qecaPDSBUm2D4zIHiMfb4Mv576hTeizs5rpFP+fPFSiDDMw== X-Received: by 2002:a17:906:11d2:: with SMTP id o18mr3455801eja.420.1600937503666; Thu, 24 Sep 2020 01:51:43 -0700 (PDT) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com. [209.85.221.45]) by smtp.gmail.com with ESMTPSA id d25sm2035347edq.52.2020.09.24.01.51.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Sep 2020 01:51:43 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id o5so2814627wrn.13; Thu, 24 Sep 2020 01:51:43 -0700 (PDT) X-Received: by 2002:a5d:5751:: with SMTP id q17mr3908539wrw.409.1600937503054; Thu, 24 Sep 2020 01:51:43 -0700 (PDT) MIME-Version: 1.0 References: <202009231254.08NCsbvl097012@repo.freebsd.org> <17915865-DF2F-473D-AB52-4C69D7DB706F@freebsd.org> In-Reply-To: From: Alexander Richardson Date: Thu, 24 Sep 2020 09:51:31 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r366074 - in head/.github: . workflows To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Jessica Clarke , Ed Maste , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Bxpgj2fhrz47Y5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2020 08:51:46 -0000 On Thu, 24 Sep 2020 at 08:33, Ulrich Sp=C3=B6rlein wrote: > > I created the exact same workflow via the github UI (creating a brand new= commit on master) and then force-pushed over it, that seems to have gotten= it unstuck). > > Now where can one see these workflows in action and how are they triggere= d? > > Under https://github.com/freebsd/freebsd/actions?query=3Dworkflow%3A%22Cr= oss-build+CI%22 I see them taking only 10min? Is that true for a whole buil= dkernel? > > What machines are these running on? How is this being paid for? > Thanks for fixing it and sorry again for the inconvenience. GitHub actions is free for public repositories and I believe the VMs used for building have 2 CPUs and 7GB RAM (https://docs.github.com/en/actions/reference/specifications-for-github-hos= ted-runners#supported-runners-and-hardware-resources) and can run for up to 6 hours (https://docs.github.com/en/actions/reference/usage-limits-billing-and-admi= nistration). It only takes 10 minutes because the buildkernel step does not include modules so is significantly faster than the default configuration. Also we don't need to bootstrap LLVM so that saves lots of time. > On Wed, Sep 23, 2020 at 10:20 PM Ulrich Sp=C3=B6rlein w= rote: >> >> On Wed, Sep 23, 2020 at 9:38 PM Alexander Richardson >> wrote: >> > >> > On Wed, 23 Sep 2020 at 20:20, Ulrich Sp=C3=B6rlein w= rote: >> > > >> > > On Wed, Sep 23, 2020 at 4:33 PM Jessica Clarke = wrote: >> > > > >> > > > On 23 Sep 2020, at 15:29, Ulrich Sp=C3=B6rlein w= rote: >> > > > > >> > > > > This broke pushing to github, so the converter is currently halt= ed >> > > > > >> > > > > ! [remote rejected] trunk -> svn_head (refusing to allow= an >> > > > > integration to create or update workflow >> > > > > `.github/workflows/cross-bootstrap-tools.yml`) >> > > > > error: failed to push some refs to 'base.github.com:freebsd/free= bsd.git' >> > > > > Error in pushing to github >> > > > > >> > > > > Do you know why? >> > > > >> > > > The authorisation token used for the converter needs to have the "= workflow" >> > > > scope added. >> > > >> > > All there is is a deploy key (SSH) on the repository and there's no >> > > way to give it more or less access. Only write access AFAICS. >> > > >> > > Uli >> > >> > Sorry about the breakage! I did not expect this to cause any problems. >> > Just to be sure, are GitHub actions enabled for the repository? Maybe >> > the repository level setting that disables the actions is set? The URL >> > should be https://github.com/freebsd/freebsd/settings/actions. >> > >> > Is it possible to manually push the latest changes using your personal >> > user name + SSH key? >> > >> > Alex >> >> actions are enabled under that URL yes. And I don't have write access >> with my key there's just 1 key that's allowed to push and even adding a = new >> key I can only flip the "write" bit, nothing else. >> >> I'll try to create the action in the UI now From owner-freebsd-git@freebsd.org Thu Sep 24 12:17:07 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ED9723F60B1 for ; Thu, 24 Sep 2020 12:17:07 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BxvDg4dBRz4MRy; Thu, 24 Sep 2020 12:17:07 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f178.google.com with SMTP id h2so2846469ilo.12; Thu, 24 Sep 2020 05:17:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=HEb2BebrGR+XJ7ntnluAmSKiQw6ZZBX+117q9UQMwWM=; b=ddVdAdtYUZZjCFVKaFNT/B7i3dBCzzrfcM4lrZdPfZZ6biQ3t35u85nB7loxldpDP5 /jOQ/QueRT9pzP9eCBJRalVy1Y5z04+47qvD4nSpW5UUK9cYRMIffd8VM1zOcyw9Xx3q achjDzRQ/mGR7pKOhlLvaRWp2X5dC4iDETsz/NrXj4kHSWDCRYYH7AYbUOiX4bOW2ta2 KHe+7QHddyS8cDjhF6eddXzkH62cKOVfrto2PBlZrsjKRnOa3G7/Kg0fO1/5wVXkentW vH+Gz1Lfm1b3gun+VyoUCI3+i0Ao+G6zKkkxjfH1BLXO6bQSMEsJIK7jt30v59KTvNqF f+Iw== X-Gm-Message-State: AOAM533ohf6UELtUKUAhUcQMNLZTfvPVvkh5KRHFIggJ7RV7rNSMykWj 7Q0CkgkU0LsOySfoTFjufVWvhXXqEIQaqK9xsRz/xGQF X-Google-Smtp-Source: ABdhPJwSGWkI0gu7voOYRWRtR+604DQUqMtRiVYd4Kf0ZZrx8gbOJgZP9Pw/Ec9r2H7F6Tf5PBZku//XnwRcumVEMjo= X-Received: by 2002:a92:aa8f:: with SMTP id p15mr253650ill.100.1600949826037; Thu, 24 Sep 2020 05:17:06 -0700 (PDT) MIME-Version: 1.0 References: <202009231254.08NCsbvl097012@repo.freebsd.org> <17915865-DF2F-473D-AB52-4C69D7DB706F@freebsd.org> In-Reply-To: From: Ed Maste Date: Thu, 24 Sep 2020 08:16:53 -0400 Message-ID: Subject: Re: svn commit: r366074 - in head/.github: . workflows To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Alexander Richardson , Jessica Clarke , freebsd-git Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4BxvDg4dBRz4MRy X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2020 12:17:08 -0000 On Thu, 24 Sep 2020 at 03:33, Ulrich Sp=C3=B6rlein wrote: > > I created the exact same workflow via the github UI (creating a brand new= commit on master) and then force-pushed over it, that seems to have gotten= it unstuck). I suppose this means the same thing will need to be done if there's ever a change to the workflow file? From owner-freebsd-git@freebsd.org Thu Sep 24 20:17:24 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 64842427301 for ; Thu, 24 Sep 2020 20:17:24 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4By5tr1JKKz47YL for ; Thu, 24 Sep 2020 20:17:24 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 2AE81426BD4; Thu, 24 Sep 2020 20:17:24 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2AA8C426F69 for ; Thu, 24 Sep 2020 20:17:24 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4By5tp40JYz47FN for ; Thu, 24 Sep 2020 20:17:22 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 08OKHFh5053660 for ; Thu, 24 Sep 2020 20:17:15 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 08OKHFVq053659 for git@freebsd.org; Thu, 24 Sep 2020 13:17:15 -0700 (PDT) (envelope-from david) Date: Thu, 24 Sep 2020 13:17:15 -0700 From: David Wolfskill To: git@freebsd.org Subject: Question on (my) workflow migration svn -> git Message-ID: <20200924201715.GR1390@albert.catwhisker.org> Reply-To: git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="PLQVj6KKQ8ndgLWn" Content-Disposition: inline X-Rspamd-Queue-Id: 4By5tp40JYz47FN X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [0.41 / 15.00]; HAS_REPLYTO(0.00)[git@freebsd.org]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.01)[-1.014]; RCVD_TLS_LAST(0.00)[]; NEURAL_HAM_SHORT(-0.14)[-0.136]; DMARC_NA(0.00)[catwhisker.org]; NEURAL_HAM_MEDIUM(-1.04)[-1.043]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; MAILMAN_DEST(0.00)[git]; REPLYTO_EQ_TO_ADDR(5.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2020 20:17:24 -0000 --PLQVj6KKQ8ndgLWn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The migration (of my workflow) from cvs to svn was more "cosmetic" than anything else -- the data store changed and the commands changed, but the underlying thought processes behind what I was doing stayed pretty much the same. I have no idea if that will be the case for svn -> git, so I'm putting this out for comments and, perhaps, some useful advice from folks who are more familiar with git than I am. Please note: I am not a FreeBSD committer. I have no desire (let alone requirement) to cause changes to the FreeBSD code base to show up with my fingerprints on them. Details on the below-described workflow may be found at http://www.catwhisker.org/~david/FreeBSD/upgrade.html; the current state of things may be seen at http://www.catwhisker.org/~david/FreeBSD/history/ (in case either of those is of interest). TL; DR: I sync private local mirrors, update working copies, then make the running systems match the working copies. Details: I have a couple of machines that I consider "development" machines; one is the laptop that I use for day-to-day activities; the other is a dedicated "build machine" (named "freebeast"). On ecah of these machines, I perform a daily update of: * FreeBSD stable/${head - 1} [currently: 12] * Locally-installed ports (using the ports "head" branch) * FreeBSD head Perhaps more significantly, I keep the two machines in lock-step, as my activities on my laptop constitute the bulk of my testing of what will be installed on my small handful of "production" machines each Sunday (as they get the most recent snapshot of stable/${head - 1} that freebeast built Sunday morning). To keep them in lock-step, the build machine performs a cron-initiated "svnsync" to update a local private mirror of the svn repositories (src, ports, and doc). For the laptop, it depends: * If I'm away from home, it also does the same sort of svnsync (at the same time). * If I'm home, it waits a couple of minutes, then does an rsync from the build machine's private local mirror. In any case, each of them has a private local mirror that is only updated by the "mirroring" operation -- I don't commit to it. For each of stable/${head - 1}, head, and ports, the appopriate svn working copy is updated, using the svn repo as a read-only reference. Thus (for example), when FreeBSD stable/12 was branched, it was straightforward for me to "clone" the slice used for head (to a slice that I was not actively using until then), then use "svn switch" to change the src working copy to point to stable/12 (vs. head) -- there would be little substantitiative change, so the behavior should be quite similar to what I had already experienced with head. And once I was comfortable with stable/12, I could "clone" that to overlay the old stable/11 slice. (I've been doing this -- well, substitute a few references to cvs inplace of the svn ones for early days -- since around FreeBSD 3.x (I'm pretty sure I skipped 5.x, though). And it's been working pretty well for me so far. I've evn been able to point out an occasional breakage now and then.) So: Is doing something ... similar ... to the above feasible using git (vs. svn)? And if so, may I have a pointer or two to get me started? Because it's not at all obvious to me how to accomplish it. (E.g., in my use of git so far, the notions of "repository" and "working copy" seem to be conflated, which does not lead to warm and fuzzy feelings on my part.) Thanks! Peace, david --=20 David H. Wolfskill david@catwhisker.org "Therefore, this vacancy should not be filled until we have a new president." -- Mitch McConnell, February 2016 See http://www.catwhisker.org/~david/publickey.gpg for my public key. --PLQVj6KKQ8ndgLWn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl9s/stfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcljiAgAjOjB9ZSUPdyOxg7PojeLeMKbxL64Xpqd9hDUkehLBlhM+GnzsDh10roz SVFQvds+qsCOwiFECNmJZipmnpVE8cES8cWsjrCpAZKIDmmoEOsnQgD9jri+gXOF sp1+7jk+lSL7vycg8DVcKrvMjUTEBwY4viqD2mjeSvkbDiT5gXKcqffsdNDgeGWe QZ/xC1nnER8YbsByYFRvbWV71c1wf1ek8HW4GrG3ASH6Jg0JUkyiPzM12qLnFXAA +L3jPT4j8fQV6nQXv9MyfxybR05DxuviBXKcL1+rV3/VnXO1AIlBZNX5YEsqDNKK npl3m77UlpC2+QSRhOx/P/1+SEtqbQ== =GuIT -----END PGP SIGNATURE----- --PLQVj6KKQ8ndgLWn-- From owner-freebsd-git@freebsd.org Thu Sep 24 20:53:28 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 32CD43E04BA for ; Thu, 24 Sep 2020 20:53:28 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4By6hR6KQ0z4DQR for ; Thu, 24 Sep 2020 20:53:27 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by mailman.nyi.freebsd.org (Postfix) id D72193E0441; Thu, 24 Sep 2020 20:53:27 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D6E383E063B for ; Thu, 24 Sep 2020 20:53:27 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4By6hR45j3z4DBq for ; Thu, 24 Sep 2020 20:53:27 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 488523C0199; Thu, 24 Sep 2020 20:53:26 +0000 (UTC) Date: Thu, 24 Sep 2020 20:53:26 +0000 From: Brooks Davis To: git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20200924205326.GB64154@spindle.one-eyed-alien.net> References: <20200924201715.GR1390@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5I6of5zJg18YgZEa" Content-Disposition: inline In-Reply-To: <20200924201715.GR1390@albert.catwhisker.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4By6hR45j3z4DBq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2020 20:53:28 -0000 --5I6of5zJg18YgZEa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 24, 2020 at 01:17:15PM -0700, David Wolfskill wrote: > The migration (of my workflow) from cvs to svn was more "cosmetic" > than anything else -- the data store changed and the commands > changed, but the underlying thought processes behind what I was > doing stayed pretty much the same. >=20 > I have no idea if that will be the case for svn -> git, so I'm > putting this out for comments and, perhaps, some useful advice from > folks who are more familiar with git than I am. >=20 > Please note: I am not a FreeBSD committer. I have no desire (let > alone requirement) to cause changes to the FreeBSD code base to > show up with my fingerprints on them. >=20 > Details on the below-described workflow may be found at > http://www.catwhisker.org/~david/FreeBSD/upgrade.html; the current > state of things may be seen at > http://www.catwhisker.org/~david/FreeBSD/history/ (in case either > of those is of interest). >=20 > TL; DR: I sync private local mirrors, update working copies, then make > the running systems match the working copies. >=20 > Details: > I have a couple of machines that I consider "development" machines; > one is the laptop that I use for day-to-day activities; the other > is a dedicated "build machine" (named "freebeast"). On ecah of > these machines, I perform a daily update of: >=20 > * FreeBSD stable/${head - 1} [currently: 12] > * Locally-installed ports (using the ports "head" branch) > * FreeBSD head >=20 > Perhaps more significantly, I keep the two machines in lock-step, > as my activities on my laptop constitute the bulk of my testing of > what will be installed on my small handful of "production" machines > each Sunday (as they get the most recent snapshot of stable/${head > - 1} that freebeast built Sunday morning). >=20 > To keep them in lock-step, the build machine performs a cron-initiated > "svnsync" to update a local private mirror of the svn repositories > (src, ports, and doc). For the laptop, it depends: >=20 > * If I'm away from home, it also does the same sort of svnsync (at > the same time). > * If I'm home, it waits a couple of minutes, then does an rsync > from the build machine's private local mirror. >=20 > In any case, each of them has a private local mirror that is only > updated by the "mirroring" operation -- I don't commit to it. >=20 > For each of stable/${head - 1}, head, and ports, the appopriate svn > working copy is updated, using the svn repo as a read-only reference. >=20 > Thus (for example), when FreeBSD stable/12 was branched, it was > straightforward for me to "clone" the slice used for head (to a > slice that I was not actively using until then), then use "svn > switch" to change the src working copy to point to stable/12 (vs. > head) -- there would be little substantitiative change, so the > behavior should be quite similar to what I had already experienced > with head. And once I was comfortable with stable/12, I could > "clone" that to overlay the old stable/11 slice. >=20 > (I've been doing this -- well, substitute a few references to cvs > inplace of the svn ones for early days -- since around FreeBSD 3.x > (I'm pretty sure I skipped 5.x, though). And it's been working > pretty well for me so far. I've evn been able to point out an > occasional breakage now and then.) >=20 > So: Is doing something ... similar ... to the above feasible using > git (vs. svn)? And if so, may I have a pointer or two to get me > started? Because it's not at all obvious to me how to accomplish > it. (E.g., in my use of git so far, the notions of "repository" > and "working copy" seem to be conflated, which does not lead to > warm and fuzzy feelings on my part.) To continue having the local mirror of the git repo you could use `git clone --bare ` to download a copy and not checkout out a work tree. I believe your daily updates updates would just be `git fetch`, but I haven't worked with bare repos much. You could then do a local clone of that (at the cost of two complete copies of FreeBSD history). Your laptop situation is more complicated, but I think I see how it could work. You'd initially clone from your local buildbox's mirror=20 with something like `git clone ssh://freebeast/path/to/freebsd/repo`. You'd then checkout out whatever branch you wanted and update with `git pull`. To handle the away scenario you have two choices, you can change your url of your remote branch to point to upstream freebsd and update as usual or your could add a second remote (e.g. freebsd vs the default origin) and perform a "fast-foward" merge from the corresponding branch on that remote to your working branch. This would look something like the following (totally untested with made up branch names) example: git clone ssh://freebeast/path/to/freebsd/repo freebsd cd freebsd git remote add freebsd git checkout stable/12 So long as you don't commit any local changes your update process at home would look like: cd freebsd git pull To update while away, you'd so something like: cd freebsd git fetch freebsd git merge --ff-only freebsd/stable/12 I don't see a good way to keep a bare repo on the laptop. I hope this give you an idea where to start. -- Brooks --5I6of5zJg18YgZEa Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJfbQdFAAoJEKzQXbSebgfAMOYH/i6EBSY75lZmbPleHjgxtpbt /2z/vnZSu4C4vXV5WBRvMJB1wTcaCjs2XWPH9R0CuIPkiXxiDeQL4OuQ2FMDVPIQ wI+p3ZPJVrVFxdYQz9kvNq0JlnCduIrbaZjigQhAsyn5i1TK0hIzgnSU7ImR1YRW 1qEBkoQTrSxcMqpKBfZIsIQnJJVdi/G7jzdtigSMssWBeXMZeYi2AZ5P8qWabNf5 uHNcxmhO99C9UaWv5fQ6qvKXsHMbLfyIsHgWolwjbe9XlfmM04qdibxRUlQdZo5H Wj5YNNbmZ4hnZy8w42mHNWCViyInFlEyxNLiu5s858oDaEIG9pq36TXJKIuxtmU= =7/rP -----END PGP SIGNATURE----- --5I6of5zJg18YgZEa-- From owner-freebsd-git@freebsd.org Fri Sep 25 17:11:06 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A4B163FD267 for ; Fri, 25 Sep 2020 17:11:06 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BydjP45nSz4Fjy; Fri, 25 Sep 2020 17:11:05 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-oi1-f178.google.com with SMTP id m7so3533178oie.0; Fri, 25 Sep 2020 10:11:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=5msiLjiPTsAokVzDdsLRZnKCahS9etdC4wzPMu5Z1dE=; b=lPFKA73c7vflfNxD9PH4ejYXGyILJ+odBB0DntvoYzPjjXELoSJyZ18nlIyCzczJ9S /4D34LF2H0/KiLhETcWqNL4nBlG4/YzNwR6Uiz+C5rIzB51pAyF5+AKdMOCifriQG6Uc RT6GZMvokLW3qTTPM+RJTR1niGul1LeOjd3BXOQJ81tJxWsDNxFvIlOrZNkraj9TL2R3 aG06iM0o5uqA6C3pohVe6eTJOIUbqu0ytN9Uo6VjeXX9YAoyVmsemLUdeMBuQpZcZFnp KPzqnKSL6guHPuIe6TZGQADPi1EyCpT7DMR6SXLlF+uvH3ERbRLJR7zIr00MUOLoFBhe 0qdw== X-Gm-Message-State: AOAM533BFoo2fHFO1hvp6c3BDU3MQxY4jnVZgzzw3QyR1aVh7tm8FNc7 SVxNN7bamF1n0oZvnhODUPoSwoPgIusV0HzqMKFF4FsJV2g= X-Google-Smtp-Source: ABdhPJxd0FtquXqtcbESLvsDuiR1Efy+Er+tVSdH4/AO0g4Y7j3TUYVnVZWfKi0vOau2xBjKmyHB2hT6ZZXcXX6JsmU= X-Received: by 2002:aca:c442:: with SMTP id u63mr193544oif.150.1601053863822; Fri, 25 Sep 2020 10:11:03 -0700 (PDT) MIME-Version: 1.0 References: <202009231254.08NCsbvl097012@repo.freebsd.org> <17915865-DF2F-473D-AB52-4C69D7DB706F@freebsd.org> In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Fri, 25 Sep 2020 19:10:46 +0200 Message-ID: Subject: Re: svn commit: r366074 - in head/.github: . workflows To: Ed Maste Cc: Alexander Richardson , Jessica Clarke , freebsd-git X-Rspamd-Queue-Id: 4BydjP45nSz4Fjy X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.167.178 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-2.26 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.988]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-0.94)[-0.941]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.34)[-0.335]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.178:from]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.178:from]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 17:11:06 -0000 On Thu, Sep 24, 2020 at 2:17 PM Ed Maste wrote: > On Thu, 24 Sep 2020 at 03:33, Ulrich Sp=C3=B6rlein wrot= e: > > > > I created the exact same workflow via the github UI (creating a brand > new commit on master) and then force-pushed over it, that seems to have > gotten it unstuck). > > I suppose this means the same thing will need to be done if there's > ever a change to the workflow file? > Not sure, we could try ... someone on the interwebs got their actions unstuck like so, that's where I got the idea from. We should try committing a 2nd workflow in a separate file and see how it goes ... From owner-freebsd-git@freebsd.org Fri Sep 25 17:23:27 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 363CE3FDC08 for ; Fri, 25 Sep 2020 17:23:27 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Bydzf51YBz4HGc for ; Fri, 25 Sep 2020 17:23:26 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id AC3333FD2F8; Fri, 25 Sep 2020 17:23:26 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ABFA83FDA17 for ; Fri, 25 Sep 2020 17:23:26 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bydzf2k7Yz4Gw2; Fri, 25 Sep 2020 17:23:26 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-oi1-f193.google.com with SMTP id v20so3559328oiv.3; Fri, 25 Sep 2020 10:23:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/9561GinojvSXtYCl+lAUQpzDYJFW2iFnxsnxkh2h/8=; b=S+GqhikpxS9w3YAc6xG0g0rqBfDEw05MeOYNMdaKkJ3fIijgErxmWwDHUDRa7bCoGr eflZiPiXZm0TyvCkML5vl2hml6CBp1InsrmC68yey6vntnHsbQQe1XOk3PxJzlW6blK4 9vPbqyCQLDHhmb3cELTwp+Ow65NuZZ10MT3Oh0r9KQjfqf9J9BPOVy8H1GjMcZd8gfI+ ZZTI9+OJFMXHTCcneHLmvIbZNTEgpKX3gLZmb4mrWKf3LLQKd9OxaT43E/tvJxjURnTs M7v35CdexQ+Cja8Wg9LjpSDEB/1zZ4lV3IqZPjdv8PVVwj241uFCmRx1FujnWtF0IA0P 1VBw== X-Gm-Message-State: AOAM532Xtmo64cB3p1CWglIxUnd5UsnWBPUaTB12J/ucPyXZYErNbiQi OjoYegP9lqKZSsnG2jMXLBE2VO7qXnDt5VJPC4meQVCjt+o= X-Google-Smtp-Source: ABdhPJwHkQnCS54DRX22MPL1NQle91djfgaQ6mPFRUlO3bxlN1/IBEb03VsorhGRSvfaLwgKshS+V6kkahtZCsXpVKs= X-Received: by 2002:aca:49c2:: with SMTP id w185mr193582oia.101.1601054604947; Fri, 25 Sep 2020 10:23:24 -0700 (PDT) MIME-Version: 1.0 References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> In-Reply-To: <20200924205326.GB64154@spindle.one-eyed-alien.net> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Fri, 25 Sep 2020 19:23:07 +0200 Message-ID: Subject: Re: Question on (my) workflow migration svn -> git To: Brooks Davis Cc: git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Bydzf2k7Yz4Gw2 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 17:23:27 -0000 On Thu, Sep 24, 2020 at 10:53 PM Brooks Davis wrote: > > On Thu, Sep 24, 2020 at 01:17:15PM -0700, David Wolfskill wrote: > > The migration (of my workflow) from cvs to svn was more "cosmetic" > > than anything else -- the data store changed and the commands > > changed, but the underlying thought processes behind what I was > > doing stayed pretty much the same. > > > > I have no idea if that will be the case for svn -> git, so I'm > > putting this out for comments and, perhaps, some useful advice from > > folks who are more familiar with git than I am. > > > > Please note: I am not a FreeBSD committer. I have no desire (let > > alone requirement) to cause changes to the FreeBSD code base to > > show up with my fingerprints on them. > > > > Details on the below-described workflow may be found at > > http://www.catwhisker.org/~david/FreeBSD/upgrade.html; the current > > state of things may be seen at > > http://www.catwhisker.org/~david/FreeBSD/history/ (in case either > > of those is of interest). > > > > TL; DR: I sync private local mirrors, update working copies, then make > > the running systems match the working copies. > > > > Details: > > I have a couple of machines that I consider "development" machines; > > one is the laptop that I use for day-to-day activities; the other > > is a dedicated "build machine" (named "freebeast"). On ecah of > > these machines, I perform a daily update of: > > > > * FreeBSD stable/${head - 1} [currently: 12] > > * Locally-installed ports (using the ports "head" branch) > > * FreeBSD head > > > > Perhaps more significantly, I keep the two machines in lock-step, > > as my activities on my laptop constitute the bulk of my testing of > > what will be installed on my small handful of "production" machines > > each Sunday (as they get the most recent snapshot of stable/${head > > - 1} that freebeast built Sunday morning). > > > > To keep them in lock-step, the build machine performs a cron-initiated > > "svnsync" to update a local private mirror of the svn repositories > > (src, ports, and doc). For the laptop, it depends: > > > > * If I'm away from home, it also does the same sort of svnsync (at > > the same time). > > * If I'm home, it waits a couple of minutes, then does an rsync > > from the build machine's private local mirror. > > > > In any case, each of them has a private local mirror that is only > > updated by the "mirroring" operation -- I don't commit to it. > > > > For each of stable/${head - 1}, head, and ports, the appopriate svn > > working copy is updated, using the svn repo as a read-only reference. > > > > Thus (for example), when FreeBSD stable/12 was branched, it was > > straightforward for me to "clone" the slice used for head (to a > > slice that I was not actively using until then), then use "svn > > switch" to change the src working copy to point to stable/12 (vs. > > head) -- there would be little substantitiative change, so the > > behavior should be quite similar to what I had already experienced > > with head. And once I was comfortable with stable/12, I could > > "clone" that to overlay the old stable/11 slice. > > > > (I've been doing this -- well, substitute a few references to cvs > > inplace of the svn ones for early days -- since around FreeBSD 3.x > > (I'm pretty sure I skipped 5.x, though). And it's been working > > pretty well for me so far. I've evn been able to point out an > > occasional breakage now and then.) > > > > So: Is doing something ... similar ... to the above feasible using > > git (vs. svn)? And if so, may I have a pointer or two to get me > > started? Because it's not at all obvious to me how to accomplish > > it. (E.g., in my use of git so far, the notions of "repository" > > and "working copy" seem to be conflated, which does not lead to > > warm and fuzzy feelings on my part.) > > To continue having the local mirror of the git repo you could use `git > clone --bare ` to download a copy and not checkout out > a work tree. I believe your daily updates updates would just be `git > fetch`, but I haven't worked with bare repos much. You could then do > a local clone of that (at the cost of two complete copies of FreeBSD > history). > > Your laptop situation is more complicated, but I think I see how it > could work. You'd initially clone from your local buildbox's mirror > with something like `git clone ssh://freebeast/path/to/freebsd/repo`. > You'd then checkout out whatever branch you wanted and update with `git > pull`. To handle the away scenario you have two choices, you can change > your url of your remote branch to point to upstream freebsd and update > as usual or your could add a second remote (e.g. freebsd vs the default > origin) and perform a "fast-foward" merge from the corresponding branch > on that remote to your working branch. This would look something like > the following (totally untested with made up branch names) example: > > git clone ssh://freebeast/path/to/freebsd/repo freebsd > cd freebsd > git remote add freebsd > git checkout stable/12 > > So long as you don't commit any local changes your update process at > home would look like: > > cd freebsd > git pull > > To update while away, you'd so something like: > > cd freebsd > git fetch freebsd > git merge --ff-only freebsd/stable/12 > > I don't see a good way to keep a bare repo on the laptop. > > I hope this give you an idea where to start. Why not a bare repo same as with the svnsync copies before? On each machine (doesn't matter if connected or not) he could: git clone --bare https://.../{src,ports} and "git fetch --all --prune" (or some combination) whenever internet connectivity exists. Then it's easy enough to clone from that local copy for the various branches, but it's obviously suboptimal. I recommend to read `man git-worktree`. From those bare repos, he could check out both stable/12 and head to some arbitrary location and keep them updated with ... um git pull I believe. so for svn switch, look at a bare clone + multiple worktrees (if you need just a single worktree, then don't do the bare repo, obviously). I also assume that your combination of svnsync + rsync was only due to speed, yes? You can ignore all that and always pull directly from the cgit.freebsd.org host or whatever the final URL will be. The savings in bandwidth are not worth it to do something else, but you can of course `git remote add ...` on your laptop and fetch first from the local clone and then from the internet. In short, the svnsync crutch is no longer needed, git can do that all natively and will be so much faster doing it, to boot. But, you'll need to read up on clones, fetches, bare repos, worktrees and other stuff. Happy to answer more questions, once you've played around a bit to get a feel for what's possible. Cheers Uli From owner-freebsd-git@freebsd.org Fri Sep 25 20:47:32 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0E9403E47D3 for ; Fri, 25 Sep 2020 20:47:32 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BykW76d4Gz4Yt0 for ; Fri, 25 Sep 2020 20:47:31 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from auth2-smtp.messagingengine.com (auth2-smtp.messagingengine.com [66.111.4.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bdragon/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id A8A0E1F682 for ; Fri, 25 Sep 2020 20:47:31 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id 3E21C27C0054 for ; Fri, 25 Sep 2020 16:47:31 -0400 (EDT) Received: from imap1 ([10.202.2.51]) by compute4.internal (MEProxy); Fri, 25 Sep 2020 16:47:31 -0400 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvddtgdduhedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdluddtmdenucfjughrpefofg ggkfgjfhffhffvufgtgfesthhqredtreerjeenucfhrhhomhepfdeurhgrnhguohhnuceu vghrghhrvghnfdcuoegsughrrghgohhnsefhrhgvvgeuufffrdhorhhgqeenucggtffrrg htthgvrhhnpeeifeegueevudffjeetteejjeekfedttefggfeifefgteeugeeukeeguedt udetjeenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegsughrrghgohhnodhmvghsmhhtphgr uhhthhhpvghrshhonhgrlhhithihqddutdegvdefheekieegqddukedutdekheduqdgsug hrrghgohhnpeephfhrvggvuefuffdrohhrghesihhmrghprdgttg X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id BAFD5C200A5; Fri, 25 Sep 2020 16:47:30 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-355-g3ece53b-fm-20200922.004-g3ece53b9 Mime-Version: 1.0 Message-Id: <5d228d35-5990-4644-892e-6f2da81f6b05@www.fastmail.com> In-Reply-To: References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> Date: Fri, 25 Sep 2020 15:47:10 -0500 From: "Brandon Bergren" To: freebsd-git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 20:47:32 -0000 On Fri, Sep 25, 2020, at 12:23 PM, Ulrich Sp=C3=B6rlein wrote: > Why not a bare repo same as with the svnsync copies before? >=20 > On each machine (doesn't matter if connected or not) he could: >=20 > git clone --bare https://.../{src,ports} >=20 > and "git fetch --all --prune" (or some combination) whenever internet > connectivity exists. Then it's easy enough to clone from that local > copy for the various branches, but it's obviously suboptimal. I > recommend to read `man git-worktree`. From those bare repos, he could > check out both stable/12 and head to some arbitrary location and keep > them updated with ... um git pull I believe. >=20 > so for svn switch, look at a bare clone + multiple worktrees (if you > need just a single worktree, then don't do the bare repo, obviously). >=20 > I also assume that your combination of svnsync + rsync was only due to= > speed, yes? You can ignore all that and always pull directly from the > cgit.freebsd.org host or whatever the final URL will be. The savings > in bandwidth are not worth it to do something else, but you can of > course `git remote add ...` on your laptop and fetch first from the > local clone and then from the internet. >=20 > In short, the svnsync crutch is no longer needed, git can do that all > natively and will be so much faster doing it, to boot. But, you'll > need to read up on clones, fetches, bare repos, worktrees and other > stuff. And actually, you can pull from or push to a *regular* clone as well, as= long as you are pushing to branches other than the currently-checked ou= t branch. (Git will prevent you from pushing to the checked-out branch t= o prevent the working copy from getting desynced.) --=20 Brandon Bergren bdragon@FreeBSD.org From owner-freebsd-git@freebsd.org Sat Sep 26 02:09:55 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E47D23EF79A for ; Sat, 26 Sep 2020 02:09:55 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Bysg72jxCz3fvK for ; Sat, 26 Sep 2020 02:09:55 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 5D32D3EF55A; Sat, 26 Sep 2020 02:09:55 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5CF453EF559 for ; Sat, 26 Sep 2020 02:09:55 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bysg64mW0z3g0P; Sat, 26 Sep 2020 02:09:54 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 08Q29k7J069111; Sat, 26 Sep 2020 02:09:46 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 08Q29k6d069110; Fri, 25 Sep 2020 19:09:46 -0700 (PDT) (envelope-from david) Date: Fri, 25 Sep 2020 19:09:46 -0700 From: David Wolfskill To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20200926020946.GK1390@albert.catwhisker.org> References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="9YuZrAXd5fJ6uDaZ" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4Bysg64mW0z3g0P X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Sep 2020 02:09:56 -0000 --9YuZrAXd5fJ6uDaZ Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Sep 25, 2020 at 07:23:07PM +0200, Ulrich Sp=F6rlein wrote: > On Thu, Sep 24, 2020 at 10:53 PM Brooks Davis wrote: > ... > > I don't see a good way to keep a bare repo on the laptop. > > > > I hope this give you an idea where to start. >=20 > Why not a bare repo same as with the svnsync copies before? >=20 > On each machine (doesn't matter if connected or not) he could: >=20 > git clone --bare https://.../{src,ports} >=20 > and "git fetch --all --prune" (or some combination) whenever internet > connectivity exists. Then it's easy enough to clone from that local > copy for the various branches, I have a local copy of the freebsd-cgit-beta from around 01 September (that I had picked up for experimentation). So I tried making a bare clone of it: * cd * git clone --bare file:///repo/git/freebsd/freebsd-cgit-beta (which created freebsd-cgit-beta.git/). The original was ~2.5 GB; the bare clone, ~1.2 GB. Them on another file system: * cd * git clone file:///bkp/tmp/git/freebsd-cgit-beta.git head which seems to have worked; result is ~2.5 GB. Then (after poking aoround a bit in the output of `git help clone`): * git clone -b stable/12 --single-branch file:///bkp/tmp/git/freebsd-cgit-b= eta.git stable_12 While that had the benefit of terminating quickly, the resulting messages: Cloning into 'stable_12'... warning: Could not find remote branch stable/12 to clone. fatal: Remote branch stable/12 not found in upstream origin fatal: the remote end hung up unexpectedly were not encouraging. :-} (Using "origin/stable/12" made only cosmetic differences.) So I tried: * git clone file:///bkp/tmp/git/freebsd-cgit-beta.git stable_12 which did the same thing the "head" version did (but called it by a different name). I then tried: * cd stable_12/ * git branch | cat For which the response was: * main Then, I tried this: * git checkout stable/12 and was informed: error: pathspec 'stable/12' did not match any file(s) known to git Hmm.. > but it's obviously suboptimal. I Err.. other than the apparent pilot-error(s) I made up there... why? (It's not "obvious" to me: I don't know; that's why I'm asking.) > recommend to read `man git-worktree`. From those bare repos, he could > check out both stable/12 and head to some arbitrary location and keep > them updated with ... um git pull I believe. OK; so I looked a bit at `git help worktree`, then (from within the bare repo) ran: * git worktree add ~/tmp/git/head head fatal: invalid reference: head OK; fine. * git worktree add ~/tmp/git/head main Preparing worktree (checking out 'main') Updating files: 100% (81780/81780), done. HEAD is now at d4e0ac52cc2 sh: Write absolute path in command -vV and type That "head" worktree consumes ~1/3 GB. So, then: git worktree add ~/tmp/git/stable_12 stable/12 fatal: invalid reference: stable/12 Yeah, I kinda expected that one. Not clear on how to acocmplish a checkout of stable/12 from the bare repo, though. > so for svn switch, look at a bare clone + multiple worktrees (if you > need just a single worktree, then don't do the bare repo, obviously). I'm not too fussed about that part just yet. > I also assume that your combination of svnsync + rsync was only due to > speed, yes? No. I had been given to understand that an svn repo created by svnsync maintains a record of the "parent" repo, so running svnsync subsequent to intialization will "phone home" to the "parent." For times when I was away from home, it would not be feasible for my laptop to svnsync back to my home build machine. By using rsync for the local mirroring, I also mirrored that "parent repo" information, so svnsync, when run on my laptop, (correctly) "phoned home" to svn.freebsd.org. (And yes, prior to the switch to svn, I was using CVSup to mirror the CVS repos.) > You can ignore all that and always pull directly from the > cgit.freebsd.org host or whatever the final URL will be. The savings > in bandwidth are not worth it to do something else, but you can of > course `git remote add ...` on your laptop and fetch first from the > local clone and then from the internet. For my use case, it is important to me to keep my local private mirrors as close as possible to "the same" (as one another) except for the defined periods during which they are being updated. The way I have had things set up, the vast bulk of the day, the repos, the working copies, and the running systems are all in sync with one another. Should I have occasion to point out an issue, it is easy for me to cite SVN revision numbers as appropriate, and thus make it somewhat easier for someone else to have a reasonable shot at trying to reproduce the issue(s). (This is also tied into why I made a local modification to newvers.sh, to record the latest commit to the branch in question -- not just the latest commit to the repo. But that's going away....) > In short, the svnsync crutch is no longer needed, git can do that all > natively and will be so much faster doing it, to boot. But, you'll > need to read up on clones, fetches, bare repos, worktrees and other > stuff. >=20 > Happy to answer more questions, once you've played around a bit to get > a feel for what's possible. Thank you; I appreciate it. While I use git at work, it's rather far removed from my own use case (described earlier in this thread). > Cheers > Uli > ... Peace, david --=20 David H. Wolfskill david@catwhisker.org "We aren't hiding. We are named witnesses to Donald Trump's unfitness for office." -- Miles Taylor, former chief of staff to former DHS Secretary Kirstjen Nielsen See http://www.catwhisker.org/~david/publickey.gpg for my public key. --9YuZrAXd5fJ6uDaZ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl9uoupfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcknAwf9E9k3x11tsW4ImZPrmOfZmb6VVqIpUvvGg146H9jZDL3vHN9NKdm/qwTb 2zAoFOsFBvRMOlkx2P5NxLD4Sso87MqpBQh+R/+/Ia7GpVJSNtqmTLbqKn3DFcDn CUgv/juMS9OkD5nE3bWJdWnlTdndEBRLRryCSf73AWmh0jnM5uaxuCWmJqWl2y/g OgN/QBt2buKiUjQ/Tb4oMayvChYNW0G+X+TnRtJQY4xtaUiauBs0J/lm9ODaNGvG 8NOKiEKoOxYDw8/m5OEsojyRep41SyaJpAkXq66SXBoQuoYk+V8AvjOEP6XVTPKN u4j8KhSgZ4wCm07bwcd3SdraSYbdjg== =QgMb -----END PGP SIGNATURE----- --9YuZrAXd5fJ6uDaZ-- From owner-freebsd-git@freebsd.org Sat Sep 26 12:42:27 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 74B043FE217 for ; Sat, 26 Sep 2020 12:42:27 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Bz7hz2XQ5z4YxH for ; Sat, 26 Sep 2020 12:42:27 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 56E2B3FE1CE; Sat, 26 Sep 2020 12:42:27 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 56AA03FE3A1 for ; Sat, 26 Sep 2020 12:42:27 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bz7hy6V3zz4Yj6 for ; Sat, 26 Sep 2020 12:42:26 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.15.2/8.15.2) with ESMTPS id 08QCgCk3079406 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 26 Sep 2020 14:42:12 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Sat, 26 Sep 2020 14:42:12 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: David Wolfskill Cc: git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20200926124212.GL92039@acme.spoerlein.net> References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> <20200926020946.GK1390@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200926020946.GK1390@albert.catwhisker.org> User-Agent: Mutt/1.14.6 (2020-07-11) X-Rspamd-Queue-Id: 4Bz7hy6V3zz4Yj6 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; local_wl_from(0.00)[freebsd.org] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Sep 2020 12:42:27 -0000 On Fri, 2020-09-25 at 19:09:46 -0700, David Wolfskill wrote: > On Fri, Sep 25, 2020 at 07:23:07PM +0200, Ulrich Spörlein wrote: > > On Thu, Sep 24, 2020 at 10:53 PM Brooks Davis wrote: > > ... > > > I don't see a good way to keep a bare repo on the laptop. > > > > > > I hope this give you an idea where to start. > > > > Why not a bare repo same as with the svnsync copies before? > > > > On each machine (doesn't matter if connected or not) he could: > > > > git clone --bare https://.../{src,ports} > > > > and "git fetch --all --prune" (or some combination) whenever internet > > connectivity exists. Then it's easy enough to clone from that local > > copy for the various branches, > > I have a local copy of the freebsd-cgit-beta from around 01 September > (that I had picked up for experimentation). > > So I tried making a bare clone of it: > > * cd > * git clone --bare file:///repo/git/freebsd/freebsd-cgit-beta > > (which created freebsd-cgit-beta.git/). > > The original was ~2.5 GB; the bare clone, ~1.2 GB. Ok, this is where you went wrong, I think. Your copy of freebsd-cgit-beta is a regular clone, yes? Then all the `refs` in there are suitable for a checked out copy, but not to serve as a "master copy" of sorts. (fun fact, you can convert your existing clone into a bare repo by taking the .git content and 2-3 quick edits to the config therein, but that's more advanced and would require some more trial and error round trips) Please start from this and only this: git clone --bare https://cgit-beta.freebsd.org/src.git The worktree stuff is then as simple as this: % cd src.git % git show-ref|grep stable.12 e9c4330183dcfe8a5d26843613adc0a348fd0544 refs/heads/stable/12 % git worktree add ../stable_12 stable/12 Preparing worktree (checking out 'stable/12') Updating files: 100% (81262/81262), done. HEAD is now at e9c4330183d MFC r360483,360484: Make nvmecontrol work with nda like it does with nvd, and associated bits. % git worktree add ../current main Preparing worktree (checking out 'main') Updating files: 100% (82279/82279), done. HEAD is now at 9b8dbe73434 Revert most of r360179. % git worktree list /tmp/src.git (bare) /tmp/current 9b8dbe73434 [main] /tmp/stable_12 e9c4330183d [stable/12] For debugging, please have a look at `git show-ref` outputs of the various repos, this will tell you what refs are known to them, and if stable/12 is not there, all your later attempts to check it out were doomed to fail. Why might stable/12 not be there? For that, please check `config` in the bare repo (actually it omits any `fetch` directives, as it defaults to fetching em all), or `.git/config` in a non-bare repo, it'll tell you what it fetches from where. > For my use case, it is important to me to keep my local private > mirrors as close as possible to "the same" (as one another) except > for the defined periods during which they are being updated. Hmm, instead of rsync one into the other and potentially clobbering custom branches or pulling massive pack files over and over again, I think this can be better achieved by only checking out the youngest common commit. So instead of rsync-over-ssh, you would do the following when synching them up: % hash=`ssh otherhost "cd /path/to/checkout && git show -s --format=%H"` % git fetch --prune [in the bare repo, this runs after the above, so it's guaranteed to have that ref] [actually, I think you can also git pull in the worktree and it will adjust the bare repo accordingly] % cd /worktree && git reset --hard ${hash} Hmm, I think you must pull actually, yeah, try with pulling in your checkout instead of the fetch. % cd /worktree && git pull && git reset --hard ${hash} This will bring your worktree up the latest, but the bump it down to whatever the otherhost had checked out last. Cheers Uli From owner-freebsd-git@freebsd.org Sat Sep 26 13:42:52 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0317D3FEDE2 for ; Sat, 26 Sep 2020 13:42:52 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Bz92g4jzTz4chC for ; Sat, 26 Sep 2020 13:42:51 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id A1E3B3FF312; Sat, 26 Sep 2020 13:42:51 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1A253FF411 for ; Sat, 26 Sep 2020 13:42:51 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bz92g1W4rz4cNf; Sat, 26 Sep 2020 13:42:51 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 08QDgnKL076913; Sat, 26 Sep 2020 13:42:49 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 08QDgnum076912; Sat, 26 Sep 2020 06:42:49 -0700 (PDT) (envelope-from david) Date: Sat, 26 Sep 2020 06:42:49 -0700 From: David Wolfskill To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: git@freebsd.org Subject: Re: Question on (my) workflow migration svn -> git Message-ID: <20200926134249.GX1390@albert.catwhisker.org> References: <20200924201715.GR1390@albert.catwhisker.org> <20200924205326.GB64154@spindle.one-eyed-alien.net> <20200926020946.GK1390@albert.catwhisker.org> <20200926124212.GL92039@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="IqfqxVCWwOOCfbAU" Content-Disposition: inline In-Reply-To: <20200926124212.GL92039@acme.spoerlein.net> X-Rspamd-Queue-Id: 4Bz92g1W4rz4cNf X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Sep 2020 13:42:52 -0000 --IqfqxVCWwOOCfbAU Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 26, 2020 at 02:42:12PM +0200, Ulrich Sp=F6rlein wrote: > ... > > The original was ~2.5 GB; the bare clone, ~1.2 GB. >=20 > Ok, this is where you went wrong, I think. Your copy of > freebsd-cgit-beta is a regular clone, yes? Then all the `refs` in there > are suitable for a checked out copy, but not to serve as a "master copy" > of sorts. > (fun fact, you can convert your existing clone into a bare repo by > taking the .git content and 2-3 quick edits to the config therein, but > that's more advanced and would require some more trial and error round > trips) :-} > Please start from this and only this: >=20 > git clone --bare https://cgit-beta.freebsd.org/src.git OK; I've started that process. > The worktree stuff is then as simple as this: >=20 > % cd src.git > % git show-ref|grep stable.12 > e9c4330183dcfe8a5d26843613adc0a348fd0544 refs/heads/stable/12 > % git worktree add ../stable_12 stable/12 > Preparing worktree (checking out 'stable/12') > Updating files: 100% (81262/81262), done. > HEAD is now at e9c4330183d MFC r360483,360484: Make nvmecontrol work > with nda like it does with nvd, and associated bits. > % git worktree add ../current main > Preparing worktree (checking out 'main') > Updating files: 100% (82279/82279), done. > HEAD is now at 9b8dbe73434 Revert most of r360179. > % git worktree list > /tmp/src.git (bare) > /tmp/current 9b8dbe73434 [main] > /tmp/stable_12 e9c4330183d [stable/12] Thanks. I'll poke at that later today. > For debugging, please have a look at `git show-ref` outputs of the > various repos, this will tell you what refs are known to them, and if > stable/12 is not there, all your later attempts to check it out were > doomed to fail. >=20 > Why might stable/12 not be there? For that, please check `config` in the > bare repo (actually it omits any `fetch` directives, as it defaults to > fetching em all), or `.git/config` in a non-bare repo, it'll tell you > what it fetches from where. I suspect that this implies a far deeper understanding of git's internals than I have (or, really, want to have). :-} > > For my use case, it is important to me to keep my local private > > mirrors as close as possible to "the same" (as one another) except > > for the defined periods during which they are being updated. >=20 > Hmm, instead of rsync one into the other and potentially clobbering > custom branches or pulling massive pack files over and over again, I > think this can be better achieved by only checking out the youngest > common commit. Err...? This is a private local mirror of the FreeBSD repo. I do not commit to it. I do not create branches in it. Other than the "mirroring," it is read-only for my purposes. Actually, for the (CVS and) svn case(s), the repos are "owned" by a different user, and I'd need to engage in "privilege escalation" to write to them. I would prefer to be able to maintain that separation using git, but it's not a hard requirement. And the rsync takes perhaps as long as ... a minute? Even svnsync doesn't take long: svnsync started at Sat Sep 26 08:30:00 UTC 2020 svnsync for src ended at Sat Sep 26 08:30:05 UTC 2020 exit status 0 svnsync for ports ended at Sat Sep 26 08:30:09 UTC 2020 exit status 0 svnsync for doc ended at Sat Sep 26 08:30:10 UTC 2020 exit status 0 svnsync started at Sat Sep 26 10:30:00 UTC 2020 svnsync for src ended at Sat Sep 26 10:30:01 UTC 2020 exit status 0 svnsync for ports ended at Sat Sep 26 10:30:02 UTC 2020 exit status 0 svnsync for doc ended at Sat Sep 26 10:30:03 UTC 2020 exit status 0 (I got in the habit of doing the nightly updates in two passes back in the CVS days, when tagging a new branch required updating every file in the branch. [I emphatically do not miss that.] While svn doesn't appear to need that, I kept the approach -- for one thing, it wasn't broken; for another, it provided a bit of a backstop should something happen for one of the attempts.) For reference, the above svnsync runs were: * src, from r366149 -> r366181 -> r366183 * ports, from r550013 -> r550136 -> r550155 * doc, from r54527 -> r54540 -> r54541 And I have finished my "daily updates" for the day, running: FreeBSD g1-48.catwhisker.org 12.2-STABLE FreeBSD 12.2-STABLE #823 r366182M/= 366183: Sat Sep 26 03:38:27 PDT 2020 root@g1-55.catwhisker.org:/common/= S1/obj/usr/src/amd64.amd64/sys/CANARY amd64 on my laptop, and having built & smoke-tested: FreeBSD g1-48.catwhisker.org 13.0-CURRENT FreeBSD 13.0-CURRENT #12 r366181M= /366183: Sat Sep 26 05:33:13 PDT 2020 root@g1-48.catwhisker.org:/common= /S4/obj/usr/src/amd64.amd64/sys/CANARY amd64 1300117 1300117 on it earlier. The build machine is presently running: FreeBSD freebeast.catwhisker.org 12.2-STABLE FreeBSD 12.2-STABLE #1029 r366= 182M/366183: Sat Sep 26 03:37:33 PDT 2020 root@freebeast.catwhisker.org= :/common/S1/obj/usr/src/amd64.amd64/sys/GENERIC amd64 1202502 1202502 and built and smoke-tested: FreeBSD freebeast.catwhisker.org 13.0-CURRENT FreeBSD 13.0-CURRENT #1045 r3= 66181M/366183: Sat Sep 26 05:09:57 PDT 2020 root@freebeast.catwhisker.o= rg:/common/S4/obj/usr/src/amd64.amd64/sys/GENERIC amd64 1300117 1300117 earlier. (The build machine would normally be powered off at this point in the day, but this is Saturday, so it's running pudriere, building packages for tomorrow's update of the "production" machines. As with repo-updating, I do weekly package-building in two stages: the "heavy lift" on Saturday, and a "catch-up" on Sunday -- which mostly works out well enough.) > So instead of rsync-over-ssh, you would do the following when synching > them up: >=20 > % hash=3D`ssh otherhost "cd /path/to/checkout && git show -s --format=3D%= H"` > % git fetch --prune [in the bare repo, this runs after the above, so > it's guaranteed to have that ref] > [actually, I think you can also git pull in the worktree and it will > adjust the bare repo accordingly] > % cd /worktree && git reset --hard ${hash} Kinky. :-} > Hmm, I think you must pull actually, yeah, try with pulling in your > checkout instead of the fetch. > % cd /worktree && git pull && git reset --hard ${hash} >=20 > This will bring your worktree up the latest, but the bump it down to > whatever the otherhost had checked out last. That seems a bit saner than poking around determining repo hashes and =2E.. stuff; thanks. :-) Please note that the laptop treats the build machine as its source-of-truth as often as possible, and "setlles" (temporarily) for svn.freebsd.org when the build machine is unavailable. Once the build machine is available again, the next update resets the laptop to mirroring the build machine again. (And since the build machine uses svn.freebsd.org as its source-of-truth, this should not be a large difference -- in most cases, it's no difference at all.) > Cheers > Uli Oh -- that `git clone --bare` finished. So: g1-48(12.2-S)[5] cd src.git/ g1-48(12.2-S)[6] git show-ref|grep stable.12 e9c4330183dcfe8a5d26843613adc0a348fd0544 refs/heads/stable/12 g1-48(12.2-S)[7] git show-ref | grep stable/12 e9c4330183dcfe8a5d26843613adc0a348fd0544 refs/heads/stable/12 g1-48(12.2-S)[8] git worktree add /bkp/tmp/git/stable_12 stable/12 Preparing worktree (checking out 'stable/12') Updating files: 100% (81262/81262), done. HEAD is now at e9c4330183d MFC r360483,360484: Make nvmecontrol work with n= da like it does with nvd, and associated bits. g1-48(12.2-S)[9] git worktree add /bkp/tmp/git/head main Preparing worktree (checking out 'main') Updating files: 100% (82279/82279), done. HEAD is now at 9b8dbe73434 Revert most of r360179. g1-48(12.2-S)[10]=20 (My repo mirrors live on a dedicated file system -- in part so I can leave it unmounted when I'm experimenting with head. So I put the "worktrees" on a different file system from the repo -- and if those worktrees are to be my src directories, they will be on separate file systems (on separate slices, even) anyway in real life.) In any case, it looks as if we have head & stable/12 sources based on the sane (bare) repo, so that's progress. I'll plan on re-visiting the "re-silvering" of the mirror somewhat later this weekend. Thanks again! Peace, david --=20 David H. Wolfskill david@catwhisker.org "We aren't hiding. We are named witnesses to Donald Trump's unfitness for office." -- Miles Taylor, former chief of staff to former DHS Secretary Kirstjen Nielsen See http://www.catwhisker.org/~david/publickey.gpg for my public key. --IqfqxVCWwOOCfbAU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl9vRVlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnI+Af9GibcawMD28KI+7389aUqlcdYjLynw7VzxzOEh+AV1gxHSRpV4mv3biNi J/aaglrWUOPjNDhrhSczOF0NqhT1OcB8d0YJb6bM6AVG8ZzUp2x/LpGqhTEHnRx1 cGsiJ/E7YYHLgu7ojuz3iCIm5iba7KdlbgMYFy5M8lyVaPZOhdbx14MmpghD7zbs uvv4ConDYt2Ul+3fPBoRa5o6K2X42XlGycUIk8SU2K7Y8B2ywCZAwCA/m6ieS+Ve Y92XzBf5MSyBYik5dYMLFdt8Y4XshjmxGvcYufRmTF4UBPUub2z6cJ8IKZtdjp6c WXXtwZ+Cihuzf4XhiTdjS+xFiKV68g== =Mbi0 -----END PGP SIGNATURE----- --IqfqxVCWwOOCfbAU--