Skip to content

Commit

Permalink
Merge pull request #18 from vicamo/for-myself/merge-from-debian
Browse files Browse the repository at this point in the history 
merge from debian
  • Loading branch information
@vicamo
vicamo authored Jan 26, 2025
2 parents 9d18b5b + f5d087d commit d98c651
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 21 deletions.
58 changes: 44 additions & 14 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
comma-separated codenames. Default is "active".
type: string
default: 'active'
dry_run:
description: 'Do not push to registry'
type: boolean
default: true

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -47,7 +51,7 @@ jobs:
platforms='[
["amd64", "linux/amd64"],
["arm", "linux/arm"],
["arm64", "linux/arm64/v8"],
["arm64", "linux/arm64"],
["armel", "linux/arm/v5"],
["armhf", "linux/arm/v7"],
["i386", "linux/386"],
Expand All @@ -73,7 +77,15 @@ jobs:
["sh4", "linux/sh4"]
]'
disabled_codename='[]'
disabled_arches='["hurd-amd64", "hurd-i386", "ia64", "kfreebsd-amd64", "kfreebsd-i386", "s390", "x32"]'
disabled_arches='[
"hurd-amd64",
"hurd-i386",
"ia64",
"kfreebsd-amd64",
"kfreebsd-i386",
"s390",
"x32"
]'
known_failures='[
["artful", "arm64", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/7"],
["artful", "armhf", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/7"],
Expand All @@ -94,6 +106,8 @@ jobs:
["hoary", "sparc", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/13"],
["precise", "armel", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/10"],
["precise", "powerpc", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/10"],
["trusty", "arm64", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/19"],
["trusty", "ppc64el", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/7"],
["trusty", "powerpc", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/6"],
["utopic", "amd64", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/8"],
["utopic", "arm64", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/9"],
Expand All @@ -106,20 +120,30 @@ jobs:
["vivid", "i386", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/9"],
["warty", "amd64", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/13"],
["warty", "i386", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/13"],
["warty", "powerpc", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/13"]
["warty", "powerpc", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/13"],
["xenial", "arm64", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/7"],
["xenial", "ppc64el", "https://github.com/vicamo/docker-brew-ubuntu-debootstrap/issues/7"]
]'
pin_timestamp='[]'
pin_qemu='[
["any", "alpha", "ubuntu"],
["any", "hppa", "ubuntu"],
["any", "m68k", "ubuntu"],
["any", "mips", "ubuntu"],
["any", "mipsel", "ubuntu"],
["any", "powerpc", "ubuntu"],
["any", "ppc64", "ubuntu"],
["any", "sh4", "ubuntu"],
["any", "sparc", "ubuntu"],
["any", "sparc64", "ubuntu"]
["any", "alpha", "deb"],
["any", "hppa", "deb"],
["any", "loong64", "deb"],
["any", "m68k", "deb"],
["any", "mips", "deb"],
["any", "mips64el", "deb"],
["any", "mipsel", "deb"],
["any", "powerpc", "deb"],
["any", "ppc64", "deb"],
["any", "sh4", "deb"],
["any", "sparc", "deb"],
["any", "sparc64", "deb"]
]'
include_pkgs='[
["sid", "loong64", "gpgv"],
["sid", "powerpc", "gpgv"],
["sid", "ppc64", "gpgv"],
["sid", "sparc64", "gpgv"]
]'
codenames="$(echo "${FULL_JSON}" |
Expand Down Expand Up @@ -158,6 +182,10 @@ jobs:
or ((.[0] == "any") and (.[1] == $arch))
or ((.[0] == $s.codename) and (.[1] == "any"))) | .[2]) |
first),
"pkgs":(. as $arch |
'"${include_pkgs}"' |
map(select(((.[0] == $s.codename) and (.[1] == $arch))) | .[2]) |
first),
}) |
tostring)
})')"
Expand Down Expand Up @@ -234,4 +262,6 @@ jobs:
active: ${{ matrix.active }}
architectures: ${{ matrix.architectures }}
repository: 'vicamo/ubuntu'
dry_run: ${{ github.ref_name != 'main' }}
dry_run:
${{ github.ref_name != 'main' || (github.event_name ==
'workflow_dispatch' && inputs.dry_run) }}
17 changes: 10 additions & 7 deletions .github/workflows/per-suite.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
fail-fast: false
max-parallel: 4
matrix:
include: ${{ fromJSON(inputs.architectures) }}
env:
Expand All @@ -67,6 +68,7 @@ jobs:
KNOWN_FAILURE: ${{ matrix.known_failure }}
# Use the snapshot from yesterday to preven under sync.
SNAPSHOT_DATE: ${{ matrix.timestamp || 'yesterday' }}
INCLUDE_PKGS: ${{ matrix.pkgs }}
steps:
- name: Set up QEMU (docker/setup-qemu-action)
if:
Expand All @@ -76,20 +78,20 @@ jobs:

- name: Set up QEMU (Ubuntu)
if:
matrix.qemu == 'ubuntu' && matrix.arch != 'amd64' && matrix.arch !=
'i386' && matrix.arch != 'lpia'
matrix.qemu != '' && matrix.arch != 'amd64' && matrix.arch != 'i386'
&& matrix.arch != 'lpia'
run: |
echo "deb http://archive.ubuntu.com/ubuntu/ devel main universe" | \
sudo tee /etc/apt/sources.list.d/devel.list
sudo apt-get update -q
sudo apt-get install -yq binfmt-support qemu-user-static systemd
ls -al /proc/sys/fs/binfmt_misc
sudo apt-get install -yq binfmt-support qemu-user-static
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: v0.12.0

- name: Dump QEMU supportness
run: ls -al /proc/sys/fs/binfmt_misc

- name: Download debuerreotype image tarball
uses: actions/download-artifact@v4
with:
Expand All @@ -98,7 +100,7 @@ jobs:
- name: Load debuerreotype image
run: |
docker load --input /tmp/debuerreotype.tar
docker images ls -a
docker images -a
- name: Checkout Debuerreotype
uses: actions/checkout@v4
Expand All @@ -118,6 +120,7 @@ jobs:
args=()
[ -n "${ACTIVE}" ] && [ -z "${{ matrix.timestamp }}" ] || args+=('--eol')
[ -z "${INCLUDE_PKGS}" ] || args+=(--include "${INCLUDE_PKGS}")
args+=(--arch "${ARCH}")
ret=0
Expand Down

0 comments on commit d98c651

Please sign in to comment.