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

spread: move cross builds to jammy #2490

Merged
merged 2 commits into from
Jun 23, 2022
Merged

spread: move cross builds to jammy #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ccf41b
spread: move cross builds to jammy
Saviq Jun 23, 2022
5e70604
Remove workaround for arm64
AlanGriffiths Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/spread.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@ jobs:

# Only run if we have access to secrets.
if ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}; then
TASKS+='"google:ubuntu-20.04-64:spread/build/sbuild:debian_sid"
"google:ubuntu-20.04-64:spread/build/sbuild:ubuntu"
"google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_impish"
"google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_jammy"
"google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_arm64"
"google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_armhf"
TASKS+='"google:ubuntu-22.04-64:spread/build/sbuild:debian_sid"
"google:ubuntu-22.04-64:spread/build/sbuild:ubuntu"
"google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_impish"
"google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_jammy"
"google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_arm64"
"google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_armhf"
"google:ubuntu-20.04-64:spread/build/ubuntu:rpi"
"google:ubuntu-20.04-64:spread/build/ubuntu:clang"
"google:fedora-35-64:spread/build/fedora:amd64"
"google:fedora-36-64:spread/build/fedora:amd64"
"google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_devel"
"google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_proposed"
"google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_devel"
"google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_proposed"
"google:fedora-rawhide-64:spread/build/fedora:amd64"'
fi
fi
Expand Down
10 changes: 5 additions & 5 deletions bors.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
status = [
"BuildAndTest (lxd:alpine-3.15:spread/build/alpine:amd64)",
"BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu)",
"BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_impish)",
"BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_jammy)",
"BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_arm64)",
"BuildAndTest (google:ubuntu-20.04-64:spread/build/sbuild:ubuntu_armhf)",
"BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu)",
"BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_impish)",
"BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_jammy)",
"BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_arm64)",
"BuildAndTest (google:ubuntu-22.04-64:spread/build/sbuild:ubuntu_armhf)",
"BuildAndTest (google:ubuntu-20.04-64:spread/build/ubuntu:clang)",
"BuildAndTest (google:fedora-35-64:spread/build/fedora:amd64)",
"BuildAndTest (google:fedora-36-64:spread/build/fedora:amd64)",
Expand Down
2 changes: 2 additions & 0 deletions spread.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ backends:
- alpine-3.15
- alpine-edge
- ubuntu-20.04
- ubuntu-22.04
- fedora-35
- fedora-36
google:
Expand All @@ -17,6 +18,7 @@ backends:
halt-timeout: 2h
systems:
- ubuntu-20.04-64
- ubuntu-22.04-64
- fedora-35-64
- fedora-36-64
- fedora-rawhide-64
Expand Down
3 changes: 1 addition & 2 deletions spread/build/sbuild/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ execute: |

MKSBUILD_OPTS=(
mk-sbuild
--eatmydata
--distro ${DISTRO}
${RELEASE}
)
Expand Down Expand Up @@ -77,7 +76,7 @@ execute: |
echo "export XDG_RUNTIME_DIR=/tmp" >> debian/opts.mk

# Running the tests under QEMU fails to entirely correctly support libwayland's SIGSEGV handler
if [[ ${DEB_HOST_ARCH} == arm* ]]; then
if [[ ${DEB_HOST_ARCH} == armhf ]]; then
echo "OVERRIDE_CONFIGURE_OPTIONS += -DMIR_BAD_BUFFER_TEST_ENVIRONMENT_BROKEN=ON" >> debian/opts.mk
fi

Expand Down