Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rT2Dp-00HYeb-S6 for pgsql-hackers@arkaria.postgresql.org; Thu, 25 Jan 2024 16:04:59 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1rT2Dp-000vYm-3q for pgsql-hackers@arkaria.postgresql.org; Thu, 25 Jan 2024 16:04:57 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rT2Dn-000vY0-5O for pgsql-hackers@lists.postgresql.org; Thu, 25 Jan 2024 16:04:56 +0000 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rT2Dj-003KNh-Cr for pgsql-hackers@postgresql.org; Thu, 25 Jan 2024 16:04:53 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 0E80B5C0048; Thu, 25 Jan 2024 11:04:50 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 25 Jan 2024 11:04:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eisentraut.org; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1706198690; x= 1706285090; bh=TCsx8hHpE6zF4k0l/SzxHg8Ock9dmJgCeYqOjil6uXY=; b=E BS0dF9MhpZZOf0QtKIB0HZ26DLxNFtM0kihABCFpPFrqaGix+nJIW+NG/2126/wp 84+LgiYAKgGoRuUmCwg8nXDaA0fs5Z4KjUBz4Y6TPizh6sA4G6OHnUhNkgUmrj+r CpAgxOav7mJ5DU7OyRAVbRq+Rh/v0kQHcwnxhDOq4fuOFtdLuOIs14xjjUp7YlDD uJ4ER6CzOE/Yd+6UiSOt7UzKunIrGNSxkDAbgLhLzzDvttbgQEJJqqRQf4nw/vAd tVbYke1bH40EGcoKtoQBRpg79+J5R6R5pp8jWWzziSpXbvfZFIpuyN+46LP+IRNS Q1pNWd8u8Iav4ZiiZZhOg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1706198690; x=1706285090; bh=TCsx8hHpE6zF4k0l/SzxHg8Ock9d mJgCeYqOjil6uXY=; b=qz0AjG4C1M6lbLnSY4IGJhlSP0f6SDl4NYfV11j53g4Z XPghCe3zMmRdWZRfTLaedv0Vt3dAAVR1uL5cuXB6fV06m+wam4UIpYVxZpTtNyLJ 7g3NLPSEpO2U/zw/QTHnqHszIg2dDKNuuyvFntDzQ2p8slXIno+xLl0Fbeg0u/3z 6jdFAJLlPI4WSrH0h2VKA1iLgu0NTB6yDthkbkg0hgr88Jd+hD7BwN1+Ej99Ru+s q/GRxQ5tFg3uAIBXtNVAV99aOvbe+eN1sE1e4STLVRU0amybRyTrG36xtY2r9wzT 1lu+Dx/fQE6mpoRp7TR4v/BpfrTrwhpeMcNm8JUUfg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdelgedgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurheptgfkffggfgfuvfevfhfhjgesmhdtreertddvjeenucfhrhhomheprfgvthgv rhcugfhishgvnhhtrhgruhhtuceophgvthgvrhesvghishgvnhhtrhgruhhtrdhorhhgqe enucggtffrrghtthgvrhhnpeektdeutdfhvdfhveeigfffteegvdejvdfhhfevfeevgfdt gfelgeehieevhffgieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehpvghtvghrsegvihhsvghnthhrrghuthdrohhrgh X-ME-Proxy: Feedback-ID: ie0a040ee:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 25 Jan 2024 11:04:45 -0500 (EST) Content-Type: multipart/mixed; boundary="------------DXpmlpR2gZeI4agebsdVP20P" Message-ID: <673bbcc2-3e38-44b6-9710-e7c1b2446334@eisentraut.org> Date: Thu, 25 Jan 2024 17:04:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: make dist using git archive To: pgsql-hackers Cc: Tristan Partin References: <40e80f77-a294-4f29-a16f-e21bc7bc75fc@eisentraut.org> Content-Language: en-US From: Peter Eisentraut In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------DXpmlpR2gZeI4agebsdVP20P Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 22.01.24 21:04, Tristan Partin wrote: >> +git = find_program('git', required: false, native: true, disabler: true) >> +bzip2 = find_program('bzip2', required: false, native: true, >> disabler: true) > > This doesn't need to be a disabler. git is fine as-is. See later > comment. Disablers only work like you are expecting when they are used > like how git is used. Once you call a method like .path(), all bets are > off. ok, fixed >> +distdir = meson.project_name() + '-' + meson.project_version() >> + >> +check_dirty_index = run_target('check-dirty-index', >> +                               command: [git, 'diff-index', >> '--quiet', 'HEAD']) > > Seems like you might want to add -C here too? done >> +tar_bz2 = custom_target('tar.bz2', >> +  build_always_stale: true, >> +  command: [git, '-C', '@SOURCE_ROOT@', '-c', 'tar.tar.bz2.command=' >> + bzip2.path() + ' -c', 'archive', >> +            '--format', 'tar.bz2', >> +            '--prefix', distdir + '/', > > -            '-o', '@BUILD_ROOT@/@OUTPUT@', > +            '-o', join_paths(meson.build_root(), '@OUTPUT@'), > > This will generate the tarballs in the build directory. Do the same for > the previous target. Tested locally. Fixed, thanks. I had struggled with this one. >> +            'HEAD', '.'], >> +  install: false, >> +  output: distdir + '.tar.bz2', >> +) > > The bz2 target should be wrapped in an `if bzip2.found()`. Well, I think we want the dist step to fail if bzip2 is not there. At least that is the current expectation. >> +alias_target('pgdist', [check_dirty_index, tar_gz, tar_bz2]) > > Are you intending for the check_dirty_index target to prohibit the other > two targets from running? Currently that is not the case. Yes, that was the hope, and that's how the make dist variant works. But I couldn't figure this out with meson. Also, the above actually also doesn't work with older meson versions, so I had to comment this out to get CI to work. > If it is what > you intend, use a stamp file or something to indicate a relationship. > Alternatively, inline the git diff-index into the other commands. These > might also do better as external scripts. It would reduce duplication > between the autotools and Meson builds. Yeah, maybe that's a direction. The updated patch also supports vpath builds with make now. I have also added a CI patch, for amusement. Maybe we'll want to keep it, though. --------------DXpmlpR2gZeI4agebsdVP20P Content-Type: text/plain; charset=UTF-8; name="v1-0001-make-dist-uses-git-archive.patch" Content-Disposition: attachment; filename="v1-0001-make-dist-uses-git-archive.patch" Content-Transfer-Encoding: base64 RnJvbSAxMzYxMmY5YTFjNDg2ZThhY2ZlNDE1NmE3YmMwNjlhNjZmZDMwZTc3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogVGh1LCAyNSBKYW4gMjAyNCAxMjoyODoyOCArMDEwMApTdWJqZWN0 OiBbUEFUQ0ggdjEgMS8yXSBtYWtlIGRpc3QgdXNlcyBnaXQgYXJjaGl2ZQoKRGlzY3Vzc2lv bjogaHR0cHM6Ly93d3cucG9zdGdyZXNxbC5vcmcvbWVzc2FnZS1pZC9mbGF0LzQwZTgwZjc3 LWEyOTQtNGYyOS1hMTZmLWUyMWJjN2JjNzVmYyU0MGVpc2VudHJhdXQub3JnCi0tLQogR05V bWFrZWZpbGUuaW4gfCAzNCArKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBt ZXNvbi5idWlsZCAgICB8IDQxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL0dOVW1ha2VmaWxlLmluIGIvR05VbWFrZWZpbGUuaW4KaW5k ZXggZWJhNTY5ZTkzMGUuLjY4MGM3NjVkZDczIDEwMDY0NAotLS0gYS9HTlVtYWtlZmlsZS5p bgorKysgYi9HTlVtYWtlZmlsZS5pbgpAQCAtODcsMjkgKzg3LDE5IEBAIHVwZGF0ZS11bmlj b2RlOiB8IHN1Ym1ha2UtZ2VuZXJhdGVkLWhlYWRlcnMgc3VibWFrZS1saWJwZ3BvcnQKIGRp c3RkaXIJPSBwb3N0Z3Jlc3FsLSQoVkVSU0lPTikKIGR1bW15CT0gPWluc3RhbGw9CiAKK0dJ VCA9IGdpdAorCiBkaXN0OiAkKGRpc3RkaXIpLnRhci5neiAkKGRpc3RkaXIpLnRhci5iejIK LQlybSAtcmYgJChkaXN0ZGlyKQotCi0kKGRpc3RkaXIpLnRhcjogZGlzdGRpcgotCSQoVEFS KSBjaGYgJEAgJChkaXN0ZGlyKQotCi0uSU5URVJNRURJQVRFOiAkKGRpc3RkaXIpLnRhcgot Ci1kaXN0ZGlyLWxvY2F0aW9uOgotCUBlY2hvICQoZGlzdGRpcikKLQotZGlzdGRpcjoKLQly bSAtcmYgJChkaXN0ZGlyKSogJChkdW1teSkKLQlmb3IgeCBpbiBgY2QgJCh0b3Bfc3JjZGly KSAmJiBmaW5kIC4gXCggLW5hbWUgQ1ZTIC1wcnVuZSBcKSAtbyBcKCAtbmFtZSAuZ2l0IC1w cnVuZSBcKSAtbyAtcHJpbnRgOyBkbyBcCi0JICBmaWxlPWBleHByIFgkJHggOiAnWFwuL1wo LipcKSdgOyBcCi0JICBpZiB0ZXN0IC1kICIkKHRvcF9zcmNkaXIpLyQkZmlsZSIgOyB0aGVu IFwKLQkgICAgbWtkaXIgIiQoZGlzdGRpcikvJCRmaWxlIiAmJiBjaG1vZCA3NzcgIiQoZGlz dGRpcikvJCRmaWxlIjsJXAotCSAgZWxzZSBcCi0JICAgIGxuICIkKHRvcF9zcmNkaXIpLyQk ZmlsZSIgIiQoZGlzdGRpcikvJCRmaWxlIiA+L2Rldi9udWxsIDI+JjEgXAotCSAgICAgIHx8 IGNwICIkKHRvcF9zcmNkaXIpLyQkZmlsZSIgIiQoZGlzdGRpcikvJCRmaWxlIjsgXAotCSAg ZmkgfHwgZXhpdDsgXAotCWRvbmUKLQkkKE1BS0UpIC1DICQoZGlzdGRpcikgZGlzdGNsZWFu CisKKy5QSE9OWTogY2hlY2stZGlydHktaW5kZXgKK2NoZWNrLWRpcnR5LWluZGV4OgorCSQo R0lUKSAtQyAkKHNyY2RpcikgZGlmZi1pbmRleCAtLXF1aWV0IEhFQUQKKworJChkaXN0ZGly KS50YXIuZ3o6IGNoZWNrLWRpcnR5LWluZGV4CisJJChHSVQpIC1DICQoc3JjZGlyKSBhcmNo aXZlIC0tZm9ybWF0IHRhci5neiAtLXByZWZpeCAkKGRpc3RkaXIpLyBIRUFEIC1vICQoYWJz X3RvcF9idWlsZGRpcikvJEAKKworJChkaXN0ZGlyKS50YXIuYnoyOiBjaGVjay1kaXJ0eS1p bmRleAorCSQoR0lUKSAtQyAkKHNyY2RpcikgLWMgdGFyLnRhci5iejIuY29tbWFuZD0nJChC WklQMikgLWMnIGFyY2hpdmUgLS1mb3JtYXQgdGFyLmJ6MiAtLXByZWZpeCAkKGRpc3RkaXIp LyBIRUFEIC1vICQoYWJzX3RvcF9idWlsZGRpcikvJEAKIAogZGlzdGNoZWNrOiBkaXN0CiAJ cm0gLXJmICQoZHVtbXkpCmRpZmYgLS1naXQgYS9tZXNvbi5idWlsZCBiL21lc29uLmJ1aWxk CmluZGV4IDU1MTg0ZGIyNDg4Li40Mzg4NGU3Y2ZkZCAxMDA2NDQKLS0tIGEvbWVzb24uYnVp bGQKKysrIGIvbWVzb24uYnVpbGQKQEAgLTMzNDgsNiArMzM0OCw0NyBAQCBydW5fdGFyZ2V0 KCdoZWxwJywKIAogCiAKKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworIyBEaXN0cmlidXRpb24gYXJjaGl2ZQorIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjCisKK2dpdCA9IGZpbmRfcHJvZ3JhbSgnZ2l0JywgcmVxdWlyZWQ6IGZhbHNlLCBu YXRpdmU6IHRydWUpCitiemlwMiA9IGZpbmRfcHJvZ3JhbSgnYnppcDInLCByZXF1aXJlZDog ZmFsc2UsIG5hdGl2ZTogdHJ1ZSkKKworZGlzdGRpciA9IG1lc29uLnByb2plY3RfbmFtZSgp ICsgJy0nICsgbWVzb24ucHJvamVjdF92ZXJzaW9uKCkKKworY2hlY2tfZGlydHlfaW5kZXgg PSBydW5fdGFyZ2V0KCdjaGVjay1kaXJ0eS1pbmRleCcsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29tbWFuZDogW2dpdCwgJy1DJywgJ0BTT1VSQ0VfUk9PVEAnLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnZGlmZi1pbmRleCcsICct LXF1aWV0JywgJ0hFQUQnXSkKKwordGFyX2d6ID0gY3VzdG9tX3RhcmdldCgndGFyLmd6JywK KyAgYnVpbGRfYWx3YXlzX3N0YWxlOiB0cnVlLAorICBjb21tYW5kOiBbZ2l0LCAnLUMnLCAn QFNPVVJDRV9ST09UQCcsICdhcmNoaXZlJywKKyAgICAgICAgICAgICctLWZvcm1hdCcsICd0 YXIuZ3onLAorICAgICAgICAgICAgJy0tcHJlZml4JywgZGlzdGRpciArICcvJywKKyAgICAg ICAgICAgICctbycsIGpvaW5fcGF0aHMobWVzb24uYnVpbGRfcm9vdCgpLCAnQE9VVFBVVEAn KSwKKyAgICAgICAgICAgICdIRUFEJywgJy4nXSwKKyAgaW5zdGFsbDogZmFsc2UsCisgIG91 dHB1dDogZGlzdGRpciArICcudGFyLmd6JywKKykKKwordGFyX2J6MiA9IGN1c3RvbV90YXJn ZXQoJ3Rhci5iejInLAorICBidWlsZF9hbHdheXNfc3RhbGU6IHRydWUsCisgIGNvbW1hbmQ6 IFtnaXQsICctQycsICdAU09VUkNFX1JPT1RAJywgJy1jJywgJ3Rhci50YXIuYnoyLmNvbW1h bmQ9IicgKyBiemlwMi5wYXRoKCkgKyAnIiAtYycsICdhcmNoaXZlJywKKyAgICAgICAgICAg ICctLWZvcm1hdCcsICd0YXIuYnoyJywKKyAgICAgICAgICAgICctLXByZWZpeCcsIGRpc3Rk aXIgKyAnLycsCisgICAgICAgICAgICAnLW8nLCBqb2luX3BhdGhzKG1lc29uLmJ1aWxkX3Jv b3QoKSwgJ0BPVVRQVVRAJyksCisgICAgICAgICAgICAnSEVBRCcsICcuJ10sCisgIGluc3Rh bGw6IGZhbHNlLAorICBvdXRwdXQ6IGRpc3RkaXIgKyAnLnRhci5iejInLAorKQorCisjIEZJ WE1FOiB3b3VsZCBsaWtlIHRvIGFkZCBjaGVja19kaXJ0eV9pbmRleCBoZXJlLCBicm9rZW4o PykgYmVmb3JlCisjIG1lc29uIDAuNjAuMAorYWxpYXNfdGFyZ2V0KCdwZ2Rpc3QnLCBbdGFy X2d6LCB0YXJfYnoyXSkKKworCisKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogIyBUaGUgRW5kLCBUaGUgRW5kLCBN eSBGcmllbmQKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIwoKYmFzZS1jb21taXQ6IDQ2ZDg1ODdiNTA0MTcwY2ExNGYw NjQ4OTBiYzdjY2JiZDc1MjNmODEKLS0gCjIuNDMuMAoK --------------DXpmlpR2gZeI4agebsdVP20P Content-Type: text/plain; charset=UTF-8; name="v1-0002-WIP-Add-dist-building-to-CI.patch" Content-Disposition: attachment; filename="v1-0002-WIP-Add-dist-building-to-CI.patch" Content-Transfer-Encoding: base64 RnJvbSAzZGVmOWE3OGYyNTY0MzMwNGFhOWNjODQ3ZmM5MzM3NjU0NmQzNWJmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogVGh1LCAyNSBKYW4gMjAyNCAxNTozNTo0OCArMDEwMApTdWJqZWN0 OiBbUEFUQ0ggdjEgMi8yXSBXSVA6IEFkZCBkaXN0IGJ1aWxkaW5nIHRvIENJCgpOb3RlOiBm cmVlYnNkIHJlcGFydGl0aW9uIHNjcmlwdCBkaWRuJ3QgY29weSAuZ2l0IGRpcmVjdG9yeQot LS0KIC5jaXJydXMudGFza3MueW1sICAgICAgICAgICAgICAgICAgICAgICB8IDI4ICsrKysr KysrKysrKysrKysrKysrKysrKysKIHNyYy90b29scy9jaS9nY3BfZnJlZWJzZF9yZXBhcnRp dGlvbi5zaCB8ICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDEg ZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS8uY2lycnVzLnRhc2tzLnltbCBiLy5jaXJydXMu dGFza3MueW1sCmluZGV4IGU0ZTFiY2ZlYjk5Li42ZWJhMzA3M2EzNSAxMDA2NDQKLS0tIGEv LmNpcnJ1cy50YXNrcy55bWwKKysrIGIvLmNpcnJ1cy50YXNrcy55bWwKQEAgLTIwMiw2ICsy MDIsMTEgQEAgdGFzazoKICAgICAgIGJ1aWxkL3RtcF9pbnN0YWxsL3Vzci9sb2NhbC9wZ3Nx bC9iaW4vcGdfY3RsIC1EIGJ1aWxkL3J1bm5pbmdjaGVjayBzdG9wCiAgICAgRU9GCiAKKyAg ZGlzdF9zY3JpcHQ6IHwKKyAgICBzdSBwb3N0Z3JlcyAtYyAnbWVzb24gY29tcGlsZSAtQyBi dWlsZCAtdiBwZ2Rpc3QnCisgIHRhcl9hcnRpZmFjdHM6CisgICAgcGF0aDogImJ1aWxkKi8q LnRhci4qIgorCiAgIG9uX2ZhaWx1cmU6CiAgICAgIyBpZiB0aGUgc2VydmVyIGNvbnRpbnVl cyBydW5uaW5nLCBpdCBvZnRlbiBjYXVzZXMgY2lycnVzLWNpIHRvIGZhaWwKICAgICAjIGR1 cmluZyB1cGxvYWQsIGFzIGl0IGRvZXNuJ3QgZXhwZWN0IGFydGlmYWN0cyB0byBjaGFuZ2Ug c2l6ZQpAQCAtMzQ1LDYgKzM1MCwxMCBAQCB0YXNrOgogICAgICAgICAgIG1ha2UgLXMgJHtD SEVDS30gJHtDSEVDS0ZMQUdTfSAtaiR7VEVTVF9KT0JTfQogICAgICAgICBFT0YKIAorICAg ICAgZGlzdF9zY3JpcHQ6IHN1IHBvc3RncmVzIC1jICJtYWtlIGRpc3QgLWoke0JVSUxEX0pP QlN9IgorICAgICAgdGFyX2FydGlmYWN0czoKKyAgICAgICAgcGF0aDogImJ1aWxkKi8qLnRh ci4qIgorCiAgICAgICBvbl9mYWlsdXJlOgogICAgICAgICA8PDogKm9uX2ZhaWx1cmVfYWMK IApAQCAtNDAzLDYgKzQxMiwxMCBAQCB0YXNrOgogICAgICAgICAgIFBZVEhPTkNPRVJDRUNM T0NBTEU9MCBMQU5HPUMgbWVzb24gdGVzdCAkTVRFU1RfQVJHUyAtQyBidWlsZC0zMiAtLW51 bS1wcm9jZXNzZXMgJHtURVNUX0pPQlN9CiAgICAgICAgIEVPRgogCisgICAgICBkaXN0X3Nj cmlwdDogc3UgcG9zdGdyZXMgLWMgJ21lc29uIGNvbXBpbGUgLUMgYnVpbGQtMzIgLXYgcGdk aXN0JworICAgICAgdGFyX2FydGlmYWN0czoKKyAgICAgICAgcGF0aDogImJ1aWxkKi8qLnRh ci4qIgorCiAgICAgICBvbl9mYWlsdXJlOgogICAgICAgICA8PDogKm9uX2ZhaWx1cmVfbWVz b24KIApAQCAtNDk2LDYgKzUwOSwxMCBAQCB0YXNrOgogICAgIHVsaW1pdCAtbiAxMDI0ICMg ZGVmYXVsdCBpcyAyNTYsIHByZXR0eSBsb3cKICAgICBtZXNvbiB0ZXN0ICRNVEVTVF9BUkdT IC0tbnVtLXByb2Nlc3NlcyAke1RFU1RfSk9CU30KIAorICBkaXN0X3NjcmlwdDogbWVzb24g Y29tcGlsZSAtQyBidWlsZCAtdiBwZ2Rpc3QKKyAgdGFyX2FydGlmYWN0czoKKyAgICBwYXRo OiAiYnVpbGQqLyoudGFyLioiCisKICAgb25fZmFpbHVyZToKICAgICA8PDogKm9uX2ZhaWx1 cmVfbWVzb24KICAgICBjb3Jlc19zY3JpcHQ6IHNyYy90b29scy9jaS9jb3Jlc19iYWNrdHJh Y2Uuc2ggbWFjb3MgIiR7SE9NRX0vY29yZXMiCkBAIC01NjcsNiArNTg0LDEyIEBAIHRhc2s6 CiAgICAgdmN2YXJzYWxsIHg2NAogICAgIG1lc29uIHRlc3QgJU1URVNUX0FSR1MlIC0tbnVt LXByb2Nlc3NlcyAlVEVTVF9KT0JTJQogCisgIGRpc3Rfc2NyaXB0OiB8CisgICAgdmN2YXJz YWxsIHg2NAorICAgIG1lc29uIGNvbXBpbGUgLUMgYnVpbGQgLXYgcGdkaXN0CisgIHRhcl9h cnRpZmFjdHM6CisgICAgcGF0aDogImJ1aWxkKi8qLnRhci4qIgorCiAgIG9uX2ZhaWx1cmU6 CiAgICAgPDw6ICpvbl9mYWlsdXJlX21lc29uCiAgICAgY3Jhc2hsb2dfYXJ0aWZhY3RzOgpA QCAtNjI3LDYgKzY1MCwxMSBAQCB0YXNrOgogICB0ZXN0X3dvcmxkX3NjcmlwdDogfAogICAg ICVCQVNIJSAtYyAibWVzb24gdGVzdCAlTVRFU1RfQVJHUyUgLS1udW0tcHJvY2Vzc2VzICVU RVNUX0pPQlMlIgogCisgIGRpc3Rfc2NyaXB0OiB8CisgICAgJUJBU0glIC1jICJtZXNvbiBj b21waWxlIC1DIGJ1aWxkIC12IHBnZGlzdCIKKyAgdGFyX2FydGlmYWN0czoKKyAgICBwYXRo OiAiYnVpbGQqLyoudGFyLioiCisKICAgb25fZmFpbHVyZToKICAgICA8PDogKm9uX2ZhaWx1 cmVfbWVzb24KICAgICBjcmFzaGxvZ19hcnRpZmFjdHM6CmRpZmYgLS1naXQgYS9zcmMvdG9v bHMvY2kvZ2NwX2ZyZWVic2RfcmVwYXJ0aXRpb24uc2ggYi9zcmMvdG9vbHMvY2kvZ2NwX2Zy ZWVic2RfcmVwYXJ0aXRpb24uc2gKaW5kZXggMmQ1ZTE3Mzg5OTguLmVkZjM4ZTE3NTc1IDEw MDc1NQotLS0gYS9zcmMvdG9vbHMvY2kvZ2NwX2ZyZWVic2RfcmVwYXJ0aXRpb24uc2gKKysr IGIvc3JjL3Rvb2xzL2NpL2djcF9mcmVlYnNkX3JlcGFydGl0aW9uLnNoCkBAIC0yNSw0ICsy NSw0IEBAIGR1IC1ocyAkQ0lSUlVTX1dPUktJTkdfRElSCiBtdiAkQ0lSUlVTX1dPUktJTkdf RElSICRDSVJSVVNfV09SS0lOR19ESVIub3JpZwogbWtkaXIgJENJUlJVU19XT1JLSU5HX0RJ UgogbW91bnQgLW8gbm9hdGltZSAvZGV2L2RhMHAzICRDSVJSVVNfV09SS0lOR19ESVIKLWNw IC1yICRDSVJSVVNfV09SS0lOR19ESVIub3JpZy8qICRDSVJSVVNfV09SS0lOR19ESVIvCitj cCAtYSAkQ0lSUlVTX1dPUktJTkdfRElSLm9yaWcvICRDSVJSVVNfV09SS0lOR19ESVIvCi0t IAoyLjQzLjAKCg== --------------DXpmlpR2gZeI4agebsdVP20P--