forked from Yelp/dumb-init
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into upstream_v1.2.5
- Loading branch information
Showing
29 changed files
with
326 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| name: CI | ||
| on: push | ||
| jobs: | ||
| build-and-test: | ||
| runs-on: ubuntu-20.04 | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - arch: amd64 | ||
| manylinux_arch: x86_64 | ||
| docker_image: debian:buster | ||
|
|
||
| - arch: arm64 | ||
| manylinux_arch: aarch64 | ||
| docker_image: arm64v8/debian:buster | ||
|
|
||
| - arch: ppc64le | ||
| manylinux_arch: ppc64le | ||
| docker_image: ppc64le/debian:buster | ||
|
|
||
| - arch: s390x | ||
| manylinux_arch: s390x | ||
| docker_image: s390x/debian:buster | ||
|
|
||
| env: | ||
| BASE_IMAGE: ${{ matrix.docker_image }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Set up QEMU | ||
| id: qemu | ||
| uses: docker/setup-qemu-action@v1 | ||
| if: ${{ matrix.arch != 'amd64' }} | ||
| with: | ||
| image: tonistiigi/binfmt:latest | ||
|
|
||
| - name: Build Docker image | ||
| run: make docker-image | ||
|
|
||
| - name: Run python tests | ||
| run: docker run --rm -v $(pwd):/mnt:rw dumb-init-build /mnt/ci/docker-python-test | ||
|
|
||
| - name: Build Debian package | ||
| run: docker run --init --rm -v $(pwd):/mnt:rw dumb-init-build make -C /mnt builddeb | ||
|
|
||
| - name: Test built Debian package | ||
| # XXX: This uses the clean base image (not the build one) to make | ||
| # sure it installs in a clean image without any hidden dependencies. | ||
| run: docker run --rm -v $(pwd):/mnt:rw ${{ matrix.docker_image }} /mnt/ci/docker-deb-test | ||
|
|
||
| - name: Build wheels | ||
| run: sudo make python-dists-${{ matrix.manylinux_arch }} | ||
|
|
||
| - name: Upload build artifacts | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: ${{ matrix.arch }} | ||
| path: dist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,28 @@ | ||
| FROM debian:stretch | ||
| ARG BASE_IMAGE=debian:buster | ||
| FROM $BASE_IMAGE | ||
|
|
||
| LABEL maintainer="Chris Kuehl <ckuehl@yelp.com>" | ||
|
|
||
| # The default mirrors are too flaky to run reliably in CI. | ||
| RUN sed -E \ | ||
| '/security\.debian/! s@http://[^/]+/@http://mirrors.kernel.org/@' \ | ||
| -i /etc/apt/sources.list | ||
|
|
||
| # Install the bare minimum dependencies necessary for working with Debian | ||
| # packages. Build dependencies should be added under "Build-Depends" inside | ||
| # debian/control instead. | ||
| RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ | ||
| apt-get install -y --no-install-recommends \ | ||
| RUN : \ | ||
| && apt-get update \ | ||
| && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ | ||
| build-essential \ | ||
| devscripts \ | ||
| equivs \ | ||
| lintian \ | ||
| && rm -rf /var/lib/apt/lists/* && apt-get clean | ||
| WORKDIR /mnt | ||
| python3-distutils \ | ||
| python3-setuptools \ | ||
| python3-pip \ | ||
| && apt-get clean \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
| WORKDIR /tmp/mnt | ||
|
|
||
| ENTRYPOINT apt-get update && \ | ||
| mk-build-deps -i --tool 'apt-get --no-install-recommends -y' && \ | ||
| make builddeb | ||
| COPY debian/control /control | ||
| RUN : \ | ||
| && apt-get update \ | ||
| && mk-build-deps --install --tool 'apt-get -y --no-install-recommends' /control \ | ||
| && apt-get clean \ | ||
| && rm -rf /var/lib/apt/lists/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.2.2 | ||
| 1.2.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| // THIS FILE IS AUTOMATICALLY GENERATED | ||
| // Run `make VERSION.h` to update it after modifying VERSION. | ||
| unsigned char VERSION[] = { | ||
| 0x31, 0x2e, 0x32, 0x2e, 0x32, 0x0a | ||
| 0x31, 0x2e, 0x32, 0x2e, 0x35, 0x0a | ||
| }; | ||
| unsigned int VERSION_len = 6; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,12 @@ | ||
| #!/bin/bash -eux | ||
| set -o pipefail | ||
|
|
||
| . /mnt/ci/docker | ||
| apt-get update | ||
| apt-get -y --no-install-recommends install python3-pip procps | ||
|
|
||
| cd /mnt | ||
| dpkg -i dist/*.deb | ||
| pip install -r requirements-dev.txt | ||
| py.test tests/ | ||
| pip3 install -r requirements-dev.txt | ||
| pytest tests/ | ||
|
|
||
| exec dumb-init /mnt/tests/test-zombies |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| #!/bin/bash -eux | ||
| set -o pipefail | ||
| set -euo pipefail | ||
|
|
||
| . /mnt/ci/docker | ||
| cd /mnt | ||
|
|
||
| python setup.py clean | ||
| python setup.py sdist | ||
| pip install -vv dist/*.tar.gz | ||
| pip install -r requirements-dev.txt | ||
| py.test tests/ | ||
| python3 setup.py clean | ||
| python3 setup.py sdist | ||
| pip3 install -vv dist/*.tar.gz | ||
| pip3 install -r requirements-dev.txt | ||
| pytest-3 -vv tests/ | ||
|
|
||
| exec dumb-init /mnt/tests/test-zombies \ | ||
| exec dumb-init /mnt/tests/test-zombies |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.