Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Two minor fixes to Travis #38841

Closed
wants to merge 2 commits into from
Closed

Two minor fixes to Travis #38841

wants to merge 2 commits into from

Conversation

Goorzhel
Copy link
Contributor

Before 
❯ git log --oneline
6076c6dfb4 New package: radm-0.6.1
9ff585986c liburing: update to 2.2.
83e4219d31 oxipng: update to 5.0.1.
9f175ebf3b so: update to 0.4.8
bd40077123 nemo-image-converter: update to 5.4.1.
❯ cat srcpkgs/radm/template
# Template file for 'radm'
pkgname=radm
version=0.6.1
revision=1
build_style=cargo
makedepends="clang make pam-devel pandoc"
depends="seatd pam"
short_desc="Console-based display manager for Wayland sessions"
maintainer="Antonio Gurgel <antonio@goorzhel.com>"
license="MIT"
homepage="https://sr.ht/~goorzhel/radm/"
distfiles="https://git.sr.ht/~goorzhel/radm/archive/${version}.tar.gz"
checksum=81b87b76f1a59e2675bd4373f03d682b5c7f2b53adc926164f384bae8676c98a

post_install() {
        make res/radm.1

        vinstall res/pam 644 etc/pam.d radm
        vinstall res/rsyslog 644 etc/rsyslog.d radm
        vlicense LICENSE
        vman res/radm.1
        vsv radm
}
❯ sed -i 's/\/hostrepo/./' common/travis/build.sh
❯ sh -x common/travis/build.sh x86_64 aarch64-musl
+ [ x86_64 != aarch64-musl ]
+ arch=-a aarch64-musl
+ [  = 1 ]
+ cat /tmp/templates
+ ./xbps-src sort-dependencies radm
+ PKGS=radm
+ nproc
+ ./xbps-src -j12 -s -H /home/ag/hostdir -a aarch64-musl pkg radm
=> xbps-src: updating repositories for host (x86_64)...
[*] Updating repository `https://repo-default.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/nonfree/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/debug/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
[*] Updating repository `https://repo-us.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://repo-us.voidlinux.org/current/nonfree/x86_64-repodata' ...
=> xbps-src: updating repositories for target (aarch64-musl)...
[*] Updating repository `https://repo-default.voidlinux.org/current/aarch64/aarch64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/aarch64/nonfree/aarch64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/aarch64/debug/aarch64-musl-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> radm-0.6.1_1: removing autodeps, please wait...
=> radm-0.6.1_1: removing autocrossdeps, please wait...
=> radm-0.6.1_1: building [cargo] [rust] for aarch64-musl...
   [host] cargo-1.61.0_1: found (https://repo-default.voidlinux.org/current)
   [target] clang-12.0.1_2: found (https://repo-default.voidlinux.org/current/aarch64)
   [target] make-4.3_3: found (https://repo-default.voidlinux.org/current/aarch64)
   [target] pam-devel-1.5.2_2: found (https://repo-default.voidlinux.org/current/aarch64)
   [target] pandoc-2.17.1.1_1: not found
   [target] rust-std-1.61.0_1: found (https://repo-default.voidlinux.org/current/aarch64)
   [runtime] seatd-0.7.0_1: found (https://repo-default.voidlinux.org/current/aarch64)
   [runtime] pam-1.5.2_2: found (https://repo-default.voidlinux.org/current/aarch64)
=> ERROR: pandoc-2.17.1.1_1: cannot be cross compiled...
=> ERROR: pandoc-2.17.1.1_1: yes
+ [ 2 -eq 1 ]
+ exit 0
After 
❯ git log --oneline | head -3
6de27dac94 common/travis/build.sh: Handle all retcodes
6076c6dfb4 New package: radm-0.6.1
9ff585986c liburing: update to 2.2.
❯ sh -x common/travis/build.sh x86_64 aarch64-musl
+ [ x86_64 != aarch64-musl ]
+ arch=-a aarch64-musl
+ [  = 1 ]
+ cat /tmp/templates
+ ./xbps-src sort-dependencies radm
+ PKGS=radm
+ nproc
+ ./xbps-src -j12 -s -H /home/ag/hostdir -a aarch64-musl pkg radm
=> xbps-src: updating repositories for host (x86_64)...
[*] Updating repository `https://repo-default.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/nonfree/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/debug/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
[*] Updating repository `https://repo-us.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://repo-us.voidlinux.org/current/nonfree/x86_64-repodata' ...
=> xbps-src: updating repositories for target (aarch64-musl)...
[*] Updating repository `https://repo-default.voidlinux.org/current/aarch64/aarch64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/aarch64/nonfree/aarch64-musl-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/aarch64/debug/aarch64-musl-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> radm-0.6.1_1: removing autodeps, please wait...
=> radm-0.6.1_1: removing autocrossdeps, please wait...
=> radm-0.6.1_1: building [cargo] [rust] for aarch64-musl...
   [host] cargo-1.61.0_1: found (https://repo-default.voidlinux.org/current)
   [target] clang-12.0.1_2: found (https://repo-default.voidlinux.org/current/aarch64)
   [target] make-4.3_3: found (https://repo-default.voidlinux.org/current/aarch64)
   [target] pam-devel-1.5.2_2: found (https://repo-default.voidlinux.org/current/aarch64)
   [target] pandoc-2.17.1.1_1: not found
   [target] rust-std-1.61.0_1: found (https://repo-default.voidlinux.org/current/aarch64)
   [runtime] seatd-0.7.0_1: found (https://repo-default.voidlinux.org/current/aarch64)
   [runtime] pam-1.5.2_2: found (https://repo-default.voidlinux.org/current/aarch64)
=> ERROR: pandoc-2.17.1.1_1: cannot be cross compiled...
=> ERROR: pandoc-2.17.1.1_1: yes
+ ret=2
+ [ 2 -ne 0 ]
+ exit 2

@Gottox @sgn

@Goorzhel
common/travis/build.sh: Handle all retcodes
d78a30f 
There are some cases in which `xbps-src` will exit 2:
  $ ag -c 'exit 2' xbps-src common
  xbps-src:1
  common/xbps-src/shutils/common.sh:2
  $ # 1. Sending INT/TERM to xbps-src,
  $ # 2. attempting to cross-build a `nocross` pkg, and
  $ # 3. attempting to build a `broken` pkg.

build.sh eats that retcode if it's looking only for `exit 1`,
incorrectly signaling a successful build.
@Goorzhel
common/travis/changed_templates.sh: reword pls-rebase msg
61b2b8e
@Goorzhel Goorzhel mentioned this pull request Aug 23, 2022
Closed
@sgn
Copy link
Member

sgn commented Aug 23, 2022

Working as intended.

@sgn sgn closed this Aug 23, 2022
@Goorzhel
Copy link
Contributor Author

My bad, @sgn. What did I miss?

@Goorzhel Goorzhel deleted the travis_fixes branch August 23, 2022 03:18
@q66
Copy link
Contributor

q66 commented Aug 23, 2022

nocross/broken (exit value 2) are not failure cases so it does not make sense to treat them as such

@Goorzhel
Copy link
Contributor Author

Ah: 1 for unexpected failures, 2 for expected ones. A comment to that effect in build.sh or xbps-src wouldn't hurt.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Goorzhel @sgn @q66