The package rpms/delve.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=2b207cbf27b55e0....
Change: -%ifarch x86_64
Thanks.
Full change: ============
commit 2b207cbf27b55e030205a3314192c6003b336626 Author: Alejandro Sáez asm@redhat.com Date: Wed Dec 13 16:36:54 2023 +0100
Update to 1.21.2
Switch to bundled dependencies to simplify the process. Add bundle-deps.sh like rpms/golang has. Remove 0001-Skip-TestCgoStacktrace2.patch
diff --git a/.gitignore b/.gitignore index 01db2e0..b1812b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /delve-1.20.1.tar.gz /delve-1.20.2.tar.gz /delve-1.21.0.tar.gz +/delve-1.21.2.tar.gz diff --git a/0001-Skip-TestCgoStacktrace2.patch b/0001-Skip-TestCgoStacktrace2.patch deleted file mode 100644 index 4d2e0ac..0000000 --- a/0001-Skip-TestCgoStacktrace2.patch +++ /dev/null @@ -1,24 +0,0 @@ -From dff6a7871debe62db762eea34a1356f11fda305c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= asm@redhat.com -Date: Mon, 31 Jul 2023 14:46:54 +0200 -Subject: [PATCH] Skip TestCgoStacktrace2 - ---- - pkg/proc/proc_test.go | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go -index 0cb84f6b..88db4c43 100644 ---- a/pkg/proc/proc_test.go -+++ b/pkg/proc/proc_test.go -@@ -4606,6 +4606,7 @@ func TestCgoStacktrace2(t *testing.T) { - skipOn(t, "upstream issue", "windows") - skipOn(t, "broken", "386") - skipOn(t, "broken", "arm64") -+ skipOn(t, "broken", "amd64") - protest.MustHaveCgo(t) - // If a panic happens during cgo execution the stacktrace should show the C - // function that caused the problem. --- -2.41.0 - diff --git a/bundled-deps.sh b/bundled-deps.sh new file mode 100755 index 0000000..51dd446 --- /dev/null +++ b/bundled-deps.sh @@ -0,0 +1,22 @@ +#! /bin/bash +# Copyright (C) 2021 Jakub Čajka jcajka@redhat.com +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +provides="" +for bundle in $(find -name modules.txt); do +provides="$provides\n$(cat "$bundle" | grep "^# " | grep -v "# explicit" | sed -r s/"^#.* => "// | sed -r "s/# //" | sed -r "s:(.*) v(.*):Provides: bundled(golang(\1)) = \2:")" +done +echo -e "$provides" | sed 's/-/./g' | sort -u diff --git a/delve.spec b/delve.spec index c9e7cc0..eed10a3 100644 --- a/delve.spec +++ b/delve.spec @@ -3,7 +3,7 @@
# https://github.com/go-delve/delve %global goipath github.com/go-delve/delve -Version: 1.21.0 +Version: 1.21.2
%global common_description %{expand: Delve is a debugger for the Go programming language. The goal of the project @@ -27,56 +27,51 @@ License: MIT URL: %{gourl} Source0: %{gosource}
-# RHEL builds with vendored dependencies -%if %{undefined rhel} -# This dependencies are only in use in x86_64 -%ifarch x86_64 -BuildRequires: golang(github.com/cilium/ebpf) -BuildRequires: golang(github.com/cilium/ebpf/link) -BuildRequires: golang(github.com/cilium/ebpf/ringbuf) -%endif -BuildRequires: golang(github.com/cosiner/argv) -BuildRequires: golang(github.com/creack/pty) -BuildRequires: golang(github.com/derekparker/trie) -BuildRequires: golang(github.com/go-delve/liner) -BuildRequires: golang(github.com/google/go-dap) -BuildRequires: golang(github.com/hashicorp/golang-lru/simplelru) -BuildRequires: golang(github.com/mattn/go-isatty) -BuildRequires: golang(github.com/sirupsen/logrus) -BuildRequires: golang(github.com/spf13/cobra) -BuildRequires: golang(github.com/spf13/cobra/doc) -BuildRequires: golang(golang.org/x/arch/arm64/arm64asm) -BuildRequires: golang(golang.org/x/arch/ppc64/ppc64asm) -BuildRequires: golang(golang.org/x/arch/x86/x86asm) -BuildRequires: golang(golang.org/x/sys/unix) -BuildRequires: golang(golang.org/x/tools/go/packages) -BuildRequires: golang(gopkg.in/yaml.v2) -BuildRequires: golang(go.starlark.net/resolve) -BuildRequires: golang(go.starlark.net/starlark) -BuildRequires: golang(go.starlark.net/syntax) -%endif BuildRequires: lsof BuildRequires: git
-Patch1: 0001-Skip-TestCgoStacktrace2.patch +# Bundled/Vendored provides generated by bundled-deps.sh based on the in tree module data +# - in version filed substituted with . per versioning guidelines +Provides: bundled(golang(github.com/cilium/ebpf)) = 0.11.0 +Provides: bundled(golang(github.com/cosiner/argv)) = 0.1.0 +Provides: bundled(golang(github.com/cpuguy83/go.md2man/v2)) = 2.0.0 +Provides: bundled(golang(github.com/creack/pty)) = 1.1.9 +Provides: bundled(golang(github.com/derekparker/trie)) = 0.0.0.20221213183930.4c74548207f4 +Provides: bundled(golang(github.com/go.delve/liner)) = 1.2.3.0.20220127212407.d32d89dd2a5d +Provides: bundled(golang(github.com/google/go.dap)) = 0.9.1 +Provides: bundled(golang(github.com/hashicorp/golang.lru)) = 0.5.4 +Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.0.0 +Provides: bundled(golang(github.com/konsorten/go.windows.terminal.sequences)) = 1.0.3 +Provides: bundled(golang(github.com/mattn/go.colorable)) = 0.0.9 +Provides: bundled(golang(github.com/mattn/go.isatty)) = 0.0.3 +Provides: bundled(golang(github.com/mattn/go.runewidth)) = 0.0.13 +Provides: bundled(golang(github.com/rivo/uniseg)) = 0.2.0 +Provides: bundled(golang(github.com/russross/blackfriday/v2)) = 2.0.1 +Provides: bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0 +Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.6.0 +Provides: bundled(golang(github.com/spf13/cobra)) = 1.1.3 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.7.0 +Provides: bundled(golang(golang.org/x/arch)) = 0.0.0.20190927153633.4e8777c89be4 +Provides: bundled(golang(golang.org/x/exp)) = 0.0.0.20230224173230.c95f2b4c22f2 +Provides: bundled(golang(golang.org/x/mod)) = 0.12.0 +Provides: bundled(golang(golang.org/x/sys)) = 0.12.0 +Provides: bundled(golang(golang.org/x/tools)) = 0.13.0 +Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.4.0 +Provides: bundled(golang(go.starlark.net)) = 0.0.0.20220816155156.cfacd8902214
%description %{common_description}
%prep echo "=== Start prep ===" -%if %{defined rhel} %goprep -k # unpack vendored dependencies to GOPATH tar c -C vendor/ . | tar x -C %{gobuilddir}/src %autopatch -v -p1 -%else -%goprep -%autopatch -v -p1
%generate_buildrequires %go_generate_buildrequires -%endif
%build echo "=== Start build ===" @@ -106,7 +101,7 @@ popd %endif
%files -%license LICENSE %{?rhel:vendor/modules.txt} +%license LICENSE vendor/modules.txt %doc CONTRIBUTING.md CHANGELOG.md %doc Documentation/* %{_bindir}/dlv diff --git a/sources b/sources index df8bd86..9a49de1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (delve-1.21.0.tar.gz) = 2b2249b14d5565fbb59408251a1272db8e092ab7ac7cb65d33b810b89f1352d3b487a8d582dde8f1102d0362ee142e6106c98cd217c5031c9a09497d20a0cdde +SHA512 (delve-1.21.2.tar.gz) = 78953099b1ba79d04136b037d1fd45dc2f9013428a9eed77bb0bba7c43a00370d701d0576e9c1367e5e45f236ceb4bcdfc1c3366db95999dbe9e758e54225541
commit 5956211b2bbd4ef80f3b99d343fb6212f4f7313d Author: Alejandro Sáez asm@redhat.com Date: Fri Nov 17 12:23:04 2023 +0100
Set up Packit integration
diff --git a/.packit.yml b/.packit.yml new file mode 100644 index 0000000..df5f8f5 --- /dev/null +++ b/.packit.yml @@ -0,0 +1,30 @@ +specfile_path: delve.spec +files_to_sync: + - delve.spec + - .packit.yaml + +upstream_package_name: delve +upstream_project_url: https://github.com/go-delve/delve +downstream_package_name: delve +upstream_tag_template: v{version} + +jobs: + +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-all + actions: + changelog-entry: + - bash -c 'echo "- New release ${PACKIT_PROJECT_VERSION}"' + +- job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + +- job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-all +
commit 69727d9e5023115acc0287f96e065a6b9c145b3d Author: Edjunior Machado emachado@redhat.com Date: Thu Aug 17 11:04:09 2023 +0200
Introduce CI gating
diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..ce3cdc1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..eaa8bdf --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + url: https://src.fedoraproject.org/tests/delve +execute: + how: tmt
commit adee8e69e1a5a72612d24d03ebc2a38f7b65b071 Author: Alejandro Sáez asm@redhat.com Date: Fri Sep 29 10:16:02 2023 +0200
Migrated to SPDX license
diff --git a/delve.spec b/delve.spec index b398e93..c9e7cc0 100644 --- a/delve.spec +++ b/delve.spec @@ -22,6 +22,7 @@ Release: %autorelease Summary: A debugger for the Go programming language # Detected licences # - Expat License at 'LICENSE' +# It is a SPDX license already License: MIT URL: %{gourl} Source0: %{gosource}
arch-excludes@lists.fedoraproject.org