This thread contains a patchset. You're looking at the original emails,
but you may wish to use the patch review UI.
Review patch
[PATCH aerc 1/3] Build on OpenBSD
This commit drops Arch Linux in favor of a BSD so there's more variety
in CI.
See: https://lists.sr.ht/~rjarry/aerc-devel/%3C20220122033806.91728-1-ktprograms%40gmail.com%3E
---
.builds/archlinux.yml | 13 -------------
.builds/openbsd.yml | 14 ++++++++++++++
2 files changed, 14 insertions(+), 13 deletions(-)
delete mode 100644 .builds/archlinux.yml
create mode 100644 .builds/openbsd.yml
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
deleted file mode 100644
index f5c74ac..0000000
--- a/.builds/archlinux.yml
@@ -1,13 +0,0 @@
- image: archlinux- packages:- - go- - scdoc- sources:- - https://git.sr.ht/~rjarry/aerc- tasks:- - build: |- cd aerc- make- - test: |- cd aerc- go test ./...--- /dev/null
+++ b/.builds/openbsd.yml
@@ -0,0 +1,14 @@
+ ---+ image: openbsd/latest+ packages:+ - go+ - scdoc+ sources:+ - https://git.sr.ht/~rjarry/aerc+ tasks:+ - build: |+ cd aerc+ make+ - test: |+ cd aerc+ go test ./...
[PATCH aerc 2/3] Add make checkinstall
This commit adds a quick way to ensure the install was successful.
---
Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 25a3047..153b422 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,10 @@ install: $(DOCS) aerc aerc.conf
install -m644 templates/forward_as_body $(DESTDIR)$(SHAREDIR)/templates/forward_as_body
install -m644 config/default_styleset $(DESTDIR)$(SHAREDIR)/stylesets/default
+ .PHONY: checkinstall+ checkinstall:+ $(DESTDIR)$(BINDIR)/aerc -v+ RMDIR_IF_EMPTY:=sh -c '! [ -d $$0 ] || ls -1qA $$0 | grep -q . || rmdir $$0'
uninstall:
--
2.34.1
[PATCH aerc 3/3] Check make install in CI
---
.builds/alpine-edge.yml | 6 ++++++
.builds/debian-stable.yml | 6 ++++++
.builds/fedora-latest.yml | 6 ++++++
.builds/openbsd.yml | 6 ++++++
4 files changed, 24 insertions(+)
diff --git a/.builds/alpine-edge.yml b/.builds/alpine-edge.yml
index fa9a49f..e2467e5 100644
--- a/.builds/alpine-edge.yml
+++ b/.builds/alpine-edge.yml
@@ -4,6 +4,8 @@ packages:
- scdoc
sources:
- https://git.sr.ht/~rjarry/aerc
+ environment:+ DESTDIR: ./out tasks:
- checkfmt: |
cd aerc
@@ -11,6 +13,10 @@ tasks:
- build: |
cd aerc
make
+ - install: |+ cd aerc+ make install+ make checkinstall - test: |
cd aerc
go test ./...
diff --git a/.builds/debian-stable.yml b/.builds/debian-stable.yml
index 5a406c8..b6bc7f1 100644
--- a/.builds/debian-stable.yml
+++ b/.builds/debian-stable.yml
@@ -4,10 +4,16 @@ packages:
- scdoc
sources:
- https://git.sr.ht/~rjarry/aerc
+ environment:+ DESTDIR: ./out tasks:
- build: |
cd aerc
make
+ - install: |+ cd aerc+ make install+ make checkinstall - test: |
cd aerc
go test ./...
diff --git a/.builds/fedora-latest.yml b/.builds/fedora-latest.yml
index 997daff..2045506 100644
--- a/.builds/fedora-latest.yml
+++ b/.builds/fedora-latest.yml
@@ -4,10 +4,16 @@ packages:
- scdoc
sources:
- https://git.sr.ht/~rjarry/aerc
+ environment:+ DESTDIR: ./out tasks:
- build: |
cd aerc
make
+ - install: |+ cd aerc+ make install+ make checkinstall - test: |
cd aerc
go test ./...
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 9fae1f2..0213baf 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -5,10 +5,16 @@ packages:
- scdoc
sources:
- https://git.sr.ht/~rjarry/aerc
+ environment:+ DESTDIR: ./out tasks:
- build: |
cd aerc
make
+ - install: |+ cd aerc+ make install+ make checkinstall - test: |
cd aerc
go test ./...
--
2.34.1
[aerc/patches] build success
Re: [PATCH aerc 2/3] Add make checkinstall
Mark Dain, Jan 22, 2022 at 15:46:
> This commit adds a quick way to ensure the install was successful.
> ---
> Makefile | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 25a3047..153b422 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -97,6 +97,10 @@ install: $(DOCS) aerc aerc.conf
> install -m644 templates/forward_as_body $(DESTDIR)$(SHAREDIR)/templates/forward_as_body
> install -m644 config/default_styleset $(DESTDIR)$(SHAREDIR)/stylesets/default
>
> +.PHONY: checkinstall
> +checkinstall:
> + $(DESTDIR)$(BINDIR)/aerc -v
Could you also check that (at least some of) the man pages and example
files are installed in their expected locations?
Don't forget to add these options when sending your new series:
--in-reply-to=20220122144653.52525-1-mark@markdain.net -v2 --annotate
so that this is linked to the same patch series on the web interface:
https://lists.sr.ht/~rjarry/aerc-devel/patches/28623
I found the Message-ID on the first patch of the series here:
https://lists.sr.ht/~rjarry/aerc-devel/%3C20220122144653.52525-1-mark%40markdain.net%3E/raw
Thanks!
[PATCH aerc v2 1/3] Build on OpenBSD
This commit drops Arch Linux in favor of a BSD so there's more variety
in CI.
See: https://lists.sr.ht/~rjarry/aerc-devel/%3C20220122033806.91728-1-ktprograms%40gmail.com%3E
---
.builds/archlinux.yml | 13 -------------
.builds/openbsd.yml | 14 ++++++++++++++
2 files changed, 14 insertions(+), 13 deletions(-)
delete mode 100644 .builds/archlinux.yml
create mode 100644 .builds/openbsd.yml
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
deleted file mode 100644
index f5c74ac..0000000
--- a/.builds/archlinux.yml
@@ -1,13 +0,0 @@
- image: archlinux- packages:- - go- - scdoc- sources:- - https://git.sr.ht/~rjarry/aerc- tasks:- - build: |- cd aerc- make- - test: |- cd aerc- go test ./...--- /dev/null
+++ b/.builds/openbsd.yml
@@ -0,0 +1,14 @@
+ ---+ image: openbsd/latest+ packages:+ - go+ - scdoc+ sources:+ - https://git.sr.ht/~rjarry/aerc+ tasks:+ - build: |+ cd aerc+ make+ - test: |+ cd aerc+ go test ./...
[PATCH aerc v2 2/3] Add make checkinstall
This commit adds a quick way to ensure the install was successful.
---
Makefile | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/Makefile b/Makefile
index 25a3047..e094621 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,18 @@ install: $(DOCS) aerc aerc.conf
install -m644 templates/forward_as_body $(DESTDIR)$(SHAREDIR)/templates/forward_as_body
install -m644 config/default_styleset $(DESTDIR)$(SHAREDIR)/stylesets/default
+ .PHONY: checkinstall+ checkinstall:+ $(DESTDIR)$(BINDIR)/aerc -v+ test -e $(DESTDIR)$(MANDIR)/man1/aerc.1+ test -e $(DESTDIR)$(MANDIR)/man5/aerc-config.5+ test -e $(DESTDIR)$(MANDIR)/man5/aerc-imap.5+ test -e $(DESTDIR)$(MANDIR)/man5/aerc-notmuch.5+ test -e $(DESTDIR)$(MANDIR)/man5/aerc-sendmail.5+ test -e $(DESTDIR)$(MANDIR)/man5/aerc-smtp.5+ test -e $(DESTDIR)$(MANDIR)/man7/aerc-tutorial.7+ test -e $(DESTDIR)$(MANDIR)/man7/aerc-templates.7+ RMDIR_IF_EMPTY:=sh -c '! [ -d $$0 ] || ls -1qA $$0 | grep -q . || rmdir $$0'
uninstall:
--
2.34.1
[PATCH aerc v2 3/3] Check make install in CI
---
.builds/alpine-edge.yml | 6 ++++++
.builds/debian-stable.yml | 6 ++++++
.builds/fedora-latest.yml | 6 ++++++
.builds/openbsd.yml | 6 ++++++
4 files changed, 24 insertions(+)
diff --git a/.builds/alpine-edge.yml b/.builds/alpine-edge.yml
index fa9a49f..e2467e5 100644
--- a/.builds/alpine-edge.yml
+++ b/.builds/alpine-edge.yml
@@ -4,6 +4,8 @@ packages:
- scdoc
sources:
- https://git.sr.ht/~rjarry/aerc
+ environment:+ DESTDIR: ./out tasks:
- checkfmt: |
cd aerc
@@ -11,6 +13,10 @@ tasks:
- build: |
cd aerc
make
+ - install: |+ cd aerc+ make install+ make checkinstall - test: |
cd aerc
go test ./...
diff --git a/.builds/debian-stable.yml b/.builds/debian-stable.yml
index 5a406c8..b6bc7f1 100644
--- a/.builds/debian-stable.yml
+++ b/.builds/debian-stable.yml
@@ -4,10 +4,16 @@ packages:
- scdoc
sources:
- https://git.sr.ht/~rjarry/aerc
+ environment:+ DESTDIR: ./out tasks:
- build: |
cd aerc
make
+ - install: |+ cd aerc+ make install+ make checkinstall - test: |
cd aerc
go test ./...
diff --git a/.builds/fedora-latest.yml b/.builds/fedora-latest.yml
index 997daff..2045506 100644
--- a/.builds/fedora-latest.yml
+++ b/.builds/fedora-latest.yml
@@ -4,10 +4,16 @@ packages:
- scdoc
sources:
- https://git.sr.ht/~rjarry/aerc
+ environment:+ DESTDIR: ./out tasks:
- build: |
cd aerc
make
+ - install: |+ cd aerc+ make install+ make checkinstall - test: |
cd aerc
go test ./...
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 9fae1f2..0213baf 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -5,10 +5,16 @@ packages:
- scdoc
sources:
- https://git.sr.ht/~rjarry/aerc
+ environment:+ DESTDIR: ./out tasks:
- build: |
cd aerc
make
+ - install: |+ cd aerc+ make install+ make checkinstall - test: |
cd aerc
go test ./...
--
2.34.1
Re: [PATCH aerc v2 1/3] Build on OpenBSD