From nobody Wed Apr 8 02:45:31 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fr6qw1N7tz6YD1B for ; Wed, 08 Apr 2026 02:45:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fr6qv697xz3Ndm for ; Wed, 08 Apr 2026 02:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775616331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ci0mqn24jkmFMjPljFMcb0lHq4Fr1uDDD8GYMS+pMsw=; b=cQu1aSOU7+hfbESx/D6w3nUJ1C3kR/0n+1/UDZwTc1ixkZG+1HO20ik+09I47KA5Hq8ZLa qRKBJmnIkWZsyB53cc8h58EfTmtM8PHaobRWdoXGnfZhr5IXId2FUwFl7VUM3jiqzMCEe0 TanIJ9iRgZQa9a5SmFbSxMKBigwwTkRlG240RWJ3Uy5/DHGJM87vChQ92Cq0i2aWm49zCw TYicLL14y3lz2X8XyTBekqlAlvk2zhFCo3l/nd4cAB64/Es1iUzTvi+oGGNBgptTT5gyQ7 0OF3JTFDgnaHDIzDPgbKd7yC3YzDJTm1vwpadOvMqbRtt2c7tYRgOvfCLdpkzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775616331; a=rsa-sha256; cv=none; b=RPjuaA5FHpQYpyFOKE9lqJINqyJfo2HFybddxoLY8xzVBLuuUyFIreRqHNOAOSC+EXikIi ji3PlZLF8aKk1h0jqUeSWiRSIZ1ASo+w9Qhi1K5ioxNCverElQyYO2hf36p4wyFz7su8aV A24G09FaN+M9EtPWwfRrEeUiZ3IWg2mNAQJEgatNUDiPiKzzmDJnszVrl4HY8NgvBVI8ni vkHObu6LWf3lKB82wXRidj3k65wxby2ZqEL92kqVbMZmiL7SCduSesZWdEYGYd7hsQS25k K0ftlwcCwupGNoqKxETtDcuO5/I6Qp2ChO/yW61Mx/rrSNiqS7IC5dT0dEos5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775616331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ci0mqn24jkmFMjPljFMcb0lHq4Fr1uDDD8GYMS+pMsw=; b=v6mTeMKzRsxjZBHqmy4LSWw5RPCfn4gh4LsJQ6yYHjHTyDASH1u/5fDUHYpTL3B+E02AH+ RaZLYxHenClaH7Kj8ZFjGjTRfEGAfaKQCne+GPte3A9ck8q0m4C8Vq9W5f7ao/gYzmQF3l whiNJrrfwdV9s/ciSqsLfYIHMYFdyZ6jFJJ3w/q2YkgoRSYY/I84dzWNtJXQuNqXjNjzTT 4rkR1ZL9XKHMp5TQQyctvm1+pQVW+W4lB3aCDN0Vsy6pdU8BpSqYZQdni+hicrPwnEsXP/ 0WnnYnRrTKto9PGlBpznZ2OXldV9u6RpRgUZhhWmYuA4Wb19Fu8P7E8dv0PRMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fr6qv2sLKz16g7 for ; Wed, 08 Apr 2026 02:45:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41ed0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 02:45:31 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b650f87ba152 - main - misc/github-copilot-cli: Lock fetch to prevent conflicts between flavors List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b650f87ba1527c31aa0248d2d9da9a635ace264f Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 02:45:31 +0000 Message-Id: <69d5c14b.41ed0.7df69d8e@gitrepo.freebsd.org> The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b650f87ba1527c31aa0248d2d9da9a635ace264f commit b650f87ba1527c31aa0248d2d9da9a635ace264f Author: Yuri Victorovich AuthorDate: 2026-04-08 02:18:42 +0000 Commit: Yuri Victorovich CommitDate: 2026-04-08 02:45:26 +0000 misc/github-copilot-cli: Lock fetch to prevent conflicts between flavors --- misc/github-copilot-cli/Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/misc/github-copilot-cli/Makefile b/misc/github-copilot-cli/Makefile index 10a73175a1b4..982d9008fe9b 100644 --- a/misc/github-copilot-cli/Makefile +++ b/misc/github-copilot-cli/Makefile @@ -19,7 +19,8 @@ binary_PKGNAMESUFFIX= -bin binary_COMMENT= GitHub Copilot CLI - standalone binary (no npm dependencies) binary_PLIST= ${.CURDIR}/pkg-plist.binary -FETCH_DEPENDS= npm:www/npm \ +FETCH_DEPENDS= flock:sysutils/flock \ + npm:www/npm \ jq:textproc/jq \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss @@ -31,6 +32,8 @@ DD= ${DISTDIR}/${DIST_SUBDIR} FETCH_SCRIPT= ${PORTSDIR}/Tools/scripts/npmjs-fetch-with-dependencies.sh +FETCH_LOCKFILE= ${DD}/fetch.lock + .if ${FLAVOR} == script DISTFILES+= ${NODE_HEADERS}${EXTRACT_SUFX} @@ -99,40 +102,41 @@ PLIST_SUB= JS_ARCH=${JS_ARCH} do-fetch: @${MKDIR} ${DD} - @if ! [ -f ${DD}/${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} ]; then \ + @exec 9>${FETCH_LOCKFILE} && flock -x 9 && \ + if ! [ -f ${DD}/${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} ]; then \ ${ECHO} "====> Fetching ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}" && \ ${SETENV} TMPDIR=${WRKDIR} LOCALBASE=${LOCALBASE} ${FETCH_SCRIPT} \ ${PACKAGE_NAME} ${DISTVERSION} \ ${FILESDIR}/package-lock.json \ ${DD}/${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}; \ - fi - @if ! [ -f ${DD}/${NODE_HEADERS}${EXTRACT_SUFX} ]; then \ + fi && \ + if ! [ -f ${DD}/${NODE_HEADERS}${EXTRACT_SUFX} ]; then \ ${ECHO} "====> Fetching ${NODE_HEADERS}${EXTRACT_SUFX}" && \ ${FETCH_CMD} -q https://nodejs.org/download/release/v22.19.0/${NODE_HEADERS}${EXTRACT_SUFX} \ -o ${DD}/${NODE_HEADERS}${EXTRACT_SUFX}; \ - fi - @if ! [ -f ${DD}/pty-${dep_pty_version}${EXTRACT_SUFX} ]; then \ + fi && \ + if ! [ -f ${DD}/pty-${dep_pty_version}${EXTRACT_SUFX} ]; then \ ${ECHO} "====> Fetching dependency pty" && \ ${SETENV} TMPDIR=${WRKDIR} LOCALBASE=${LOCALBASE} ${FETCH_SCRIPT} \ ${dep_pty_npm_name} ${dep_pty_version} \ ${FILESDIR}/package-lock-pty.json \ ${DD}/pty-${dep_pty_version}${EXTRACT_SUFX}; \ - fi - @if ! [ -f ${DD}/sharp-${dep_sharp_version}${EXTRACT_SUFX} ]; then \ + fi && \ + if ! [ -f ${DD}/sharp-${dep_sharp_version}${EXTRACT_SUFX} ]; then \ ${ECHO} "====> Fetching dependency sharp" && \ ${SETENV} TMPDIR=${WRKDIR} LOCALBASE=${LOCALBASE} ${FETCH_SCRIPT} \ ${dep_sharp_npm_name} ${dep_sharp_version} \ ${FILESDIR}/package-lock-sharp.json \ ${DD}/sharp-${dep_sharp_version}${EXTRACT_SUFX}; \ - fi - @if ! [ -f ${DD}/keytar-${dep_keytar_version}${EXTRACT_SUFX} ]; then \ + fi && \ + if ! [ -f ${DD}/keytar-${dep_keytar_version}${EXTRACT_SUFX} ]; then \ ${ECHO} "====> Fetching dependency keytar" && \ ${SETENV} TMPDIR=${WRKDIR} LOCALBASE=${LOCALBASE} ${FETCH_SCRIPT} \ ${dep_keytar_npm_name} ${dep_keytar_version} \ ${FILESDIR}/package-lock-keytar.json \ ${DD}/keytar-${dep_keytar_version}${EXTRACT_SUFX}; \ - fi - @if ! [ -f ${DD}/node-addon-api-${dep_node_addon_api_version}${EXTRACT_SUFX} ]; then \ + fi && \ + if ! [ -f ${DD}/node-addon-api-${dep_node_addon_api_version}${EXTRACT_SUFX} ]; then \ ${ECHO} "====> Fetching dependency node-addon-api" && \ ${SETENV} TMPDIR=${WRKDIR} LOCALBASE=${LOCALBASE} ${FETCH_SCRIPT} \ ${dep_node_addon_api_npm_name} ${dep_node_addon_api_version} \