Compare commits

..

2 commits

Author SHA1 Message Date
Packit
b387827308 [packit] 1.22.1 upstream release
- Resolves rhbz#2265452

Upstream tag: v1.22.1
Upstream commit: 26799555
2024-02-22 16:19:58 +00:00
Packit
a208bd9c12 [packit] 1.22.0 upstream release
- Resolves rhbz#2242098

Upstream tag: v1.22.0
Upstream commit: 31a3c0de
2023-12-31 18:17:33 +00:00
6 changed files with 44 additions and 96 deletions

9
.gitignore vendored
View file

@ -4,12 +4,3 @@
/delve-1.21.2.tar.gz
/delve-1.22.0.tar.gz
/delve-1.22.1.tar.gz
/delve-1.23.0.tar.gz
/delve-1.23.1.tar.gz
/delve-1.24.0.tar.gz
/delve-1.24.1.tar.gz
/delve-1.24.2.tar.gz
/delve-1.25.0.tar.gz
/delve-1.25.1.tar.gz
/delve-1.25.2.tar.gz
/delve-1.26.0.tar.gz

View file

@ -2,26 +2,29 @@ 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}
actions:
changelog-entry:
- bash -c "echo - New release ${PACKIT_PROJECT_VERSION}"
jobs:
- job: pull_from_upstream
trigger: release
dist_git_branches:
rawhide:
fast_forward_merge_into: [fedora-branched]
- fedora-all
actions:
changelog-entry:
- bash -c 'echo "- New release ${PACKIT_PROJECT_VERSION}"'
- job: koji_build
trigger: commit
dist_git_branches: fedora-all
dist_git_branches:
- fedora-all
- job: bodhi_update
trigger: commit
dist_git_branches: fedora-all
dist_git_branches:
- fedora-all

View file

@ -1,37 +0,0 @@
From 70a9601e1b6e4d97c2c34e1989eba5726df97131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= <asm@redhat.com>
Date: Wed, 31 Jul 2024 16:54:34 +0200
Subject: [PATCH] Skipping due issues with the go version in Fedora
If the Go package gets an update, Koschei will trigger a Delve build
that will fail because Delve is not supporting the newer version of Go.
Skipping these tests is not ideal but gore returns an error if the go
version is missing.
---
pkg/proc/proc_test.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go
index 3437a2a4..a602dbcb 100644
--- a/pkg/proc/proc_test.go
+++ b/pkg/proc/proc_test.go
@@ -3236,6 +3236,7 @@ func TestShadowedFlag(t *testing.T) {
func TestDebugStripped(t *testing.T) {
// Currently only implemented for Linux ELF and macOS Mach-O executables.
// TODO(derekparker): Add support for PE.
+ skipOn(t, "not working on Fedora CI", "linux")
skipOn(t, "not working on windows", "windows")
skipOn(t, "not working on freebsd", "freebsd")
skipOn(t, "not working on linux/386", "linux", "386")
@@ -3265,6 +3266,7 @@ func TestDebugStripped(t *testing.T) {
func TestDebugStripped2(t *testing.T) {
// TODO(derekparker): Add support for PE.
+ skipOn(t, "not working on Fedora CI", "linux")
skipOn(t, "not working on windows", "windows")
skipOn(t, "not working on freebsd", "freebsd")
skipOn(t, "not working on linux/386", "linux", "386")
--
2.45.2

View file

@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 1.13.0.post1.dev2+g84134016c.
The file was generated using packit 0.92.0.

View file

@ -1,23 +1,19 @@
# Run tests in check section
%bcond_without check
%ifarch ppc64le
%global exp "-tags=exp.linuxppc64le"
%endif
# https://github.com/go-delve/delve
%global goipath github.com/go-delve/delve
Version: 1.26.0
Version: 1.22.1
%global common_description %{expand:
Delve is a debugger for the Go programming language. The goal of the project
is to provide a simple, full featured debugging tool for Go. Delve should be
easy to invoke and easy to use. Chances are if you're using a debugger, things
aren't going your way. With that in mind, Delve should stay out of your way as
Delve is a debugger for the Go programming language. The goal of the project
is to provide a simple, full featured debugging tool for Go. Delve should be
easy to invoke and easy to use. Chances are if you're using a debugger, things
aren't going your way. With that in mind, Delve should stay out of your way as
much as possible.}
# Currently Delve only supports x86_64, aarch64, and ppc64le
%global golang_arches x86_64 aarch64 ppc64le
# Currently Delve only supports x86_64 and aarch64
%global golang_arches x86_64 aarch64
%gometa
@ -38,31 +34,31 @@ BuildRequires: git
# - 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.2
Provides: bundled(golang(github.com/creack/pty)) = 1.1.20
Provides: bundled(golang(github.com/derekparker/trie)) = 0.0.0.20230829180723.39f4de51ef7d
Provides: bundled(golang(github.com/go.delve/liner)) = 1.2.3.0.20231231155935.4726ab1d7f62
Provides: bundled(golang(github.com/google/go.dap)) = 0.12.0
Provides: bundled(golang(github.com/hashicorp/golang.lru)) = 1.0.2
Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0
Provides: bundled(golang(github.com/mattn/go.colorable)) = 0.1.13
Provides: bundled(golang(github.com/mattn/go.isatty)) = 0.0.20
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.1.0
Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3
Provides: bundled(golang(github.com/spf13/cobra)) = 1.7.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.8.4
Provides: bundled(golang(golang.org/x/arch)) = 0.6.0
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.14.0
Provides: bundled(golang(golang.org/x/sys)) = 0.17.0
Provides: bundled(golang(golang.org/x/tools)) = 0.14.0
Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
Provides: bundled(golang(go.starlark.net)) = 0.0.0.20231101134539.556fd59b42f6
Patch0001: 0001-Skipping-due-issues-with-the-go-version-in-Fedora.patch
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}
@ -76,10 +72,11 @@ tar c -C vendor/ . | tar x -C %{gobuilddir}/src
%build
echo "=== Start build ==="
%gobuild %{?exp} -o %{gobuilddir}/bin/dlv %{goipath}/cmd/dlv
%gobuild -o %{gobuilddir}/bin/dlv %{goipath}/cmd/dlv
echo "=== End build ==="
%install
%gopkginstall
install -m 0755 -vd %{buildroot}%{_bindir}
install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
@ -88,19 +85,13 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
export GO111MODULE=off
export GOPATH=%{buildroot}/%{gopath}:%{gobuilddir}:%{gopath}
delvepath=%{buildroot}/%{gopath}/src/%{goipath}
mkdir -p $delvepath
mkdir -p $delvepath/pkg/dwarf/line
mkdir -p $delvepath/pkg/proc/internal
cp -r _fixtures $delvepath
cp -r pkg/dwarf $delvepath/pkg/
cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line
cp -r pkg/proc/internal/ebpf $delvepath/pkg/proc/internal/
pushd $delvepath
echo "=== Start tests ==="
for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do
go test %{?exp} ${d} -skip TestGuessSubstitutePath
done
%gotest $(go list ./... | awk '!/(cmd|scripts)/ {print $1}')
echo "=== End tests ==="
rm -rf $delvepath
popd

View file

@ -1 +1 @@
SHA512 (delve-1.26.0.tar.gz) = 1b9d5c7b91bbf1df47c1fdb3553893497defe7a71ae9c7cef160cf15afac391fe77f66b748e028b29aa3456c21cfc079c2751afb788cb065ee8580501d21ad0e
SHA512 (delve-1.22.1.tar.gz) = 73b6e7f5c88ffe3c3197a33106c2d10349bb622f10ec54e3dd0b045ed5717a341d48c5415f6b56b3a927afa6d994ff30dced802f82ed14d149f202f46c7a6b44