From 4559a7e7089ff467c3b81ffac7a3de8fc2d92b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 4 Sep 2024 12:56:58 +0200 Subject: [PATCH 1/9] deb: buildx/compose version from version env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- common.mk | 3 +++ deb/Makefile | 4 ++-- rpm/Makefile | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common.mk b/common.mk index 62824446c6..d10d43f79e 100644 --- a/common.mk +++ b/common.mk @@ -45,6 +45,9 @@ DOCKER_COMPOSE_REF ?= v2.29.2 # but can be a valid git reference in DOCKER_BUILDX_REPO. DOCKER_BUILDX_REF ?= v0.16.2 +DOCKER_BUILDX_VERSION ?= $(DOCKER_BUILDX_REF) +DOCKER_COMPOSE_VERSION ?= $(DOCKER_COMPOSE_REF) + # Use "stage" to install dependencies from download-stage.docker.com during the # verify step. Leave empty or use any other value to install from download.docker.com VERIFY_PACKAGE_REPO ?= prod diff --git a/deb/Makefile b/deb/Makefile index d65bd11e08..79709191eb 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -5,8 +5,8 @@ GO_BASE_IMAGE=golang GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-bookworm EPOCH?=5 GEN_DEB_VER=$(shell ./gen-deb-ver $(realpath $(CURDIR)/../src/github.com/docker/cli) "$(VERSION)") -GEN_BUILDX_DEB_VER=$(shell ./gen-deb-ver $(realpath $(CURDIR)/../src/github.com/docker/buildx) "$(DOCKER_BUILDX_REF)") -GEN_COMPOSE_DEB_VER=$(shell ./gen-deb-ver $(realpath $(CURDIR)/../src/github.com/docker/compose) "$(DOCKER_COMPOSE_REF)") +GEN_BUILDX_DEB_VER=$(shell ./gen-deb-ver $(realpath $(CURDIR)/../src/github.com/docker/buildx) "$(DOCKER_BUILDX_VERSION)") +GEN_COMPOSE_DEB_VER=$(shell ./gen-deb-ver $(realpath $(CURDIR)/../src/github.com/docker/compose) "$(DOCKER_COMPOSE_VERSION)") CLI_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/cli) && git rev-parse --short HEAD) ENGINE_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/docker) && git rev-parse --short HEAD) BUILDX_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/buildx) && git rev-parse --short HEAD) diff --git a/rpm/Makefile b/rpm/Makefile index da37c205c8..d51eef97bd 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -4,8 +4,8 @@ PLUGINS_DIR=$(realpath $(CURDIR)/../plugins) GO_BASE_IMAGE=golang GO_IMAGE?=$(GO_BASE_IMAGE):$(GO_VERSION)-bookworm GEN_RPM_VER=$(shell ./gen-rpm-ver $(realpath $(CURDIR)/../src/github.com/docker/cli) "$(VERSION)") -GEN_BUILDX_RPM_VER=$(shell ./gen-rpm-ver $(realpath $(CURDIR)/../src/github.com/docker/buildx) "$(DOCKER_BUILDX_REF)") -GEN_COMPOSE_RPM_VER=$(shell ./gen-rpm-ver $(realpath $(CURDIR)/../src/github.com/docker/compose) "$(DOCKER_COMPOSE_REF)") +GEN_BUILDX_RPM_VER=$(shell ./gen-rpm-ver $(realpath $(CURDIR)/../src/github.com/docker/buildx) "$(DOCKER_BUILDX_VERSION)") +GEN_COMPOSE_RPM_VER=$(shell ./gen-rpm-ver $(realpath $(CURDIR)/../src/github.com/docker/compose) "$(DOCKER_COMPOSE_VERSION)") CLI_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/cli) && git rev-parse --short HEAD) ENGINE_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/docker) && git rev-parse --short HEAD) BUILDX_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/buildx) && git rev-parse --short HEAD) From 800084265aecc1c1acb62fe075af0d12ed6a50de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Fri, 5 Jul 2024 16:02:47 +0200 Subject: [PATCH 2/9] gha: nightly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- .github/workflows/nightly.yml | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/nightly.yml diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml new file mode 100644 index 0000000000..e7e097f5e9 --- /dev/null +++ b/.github/workflows/nightly.yml @@ -0,0 +1,45 @@ +name: nightly + +on: + schedule: + - cron: '0 0 * * *' + workflow_dispatch: {} + +jobs: + build: + runs-on: selfhosted + strategy: + fail-fast: false + matrix: + target: + - debian-bookworm + steps: + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - + name: Checkout + uses: actions/checkout@v3 + + - + name: Build + run: | + export VERSION=$(date +%Y%m%d) + export REF=master + + export DOCKER_BUILDX_REF=master + export DOCKER_BUILDX_VERSION=$VERSION + + export DOCKER_COMPOSE_REF=main + export DOCKER_COMPOSE_VERSION=$VERSION + + make ${{ matrix.target }} + + - + name: Artifact + uses: actions/upload-artifact@v2 + with: + name: nightly-${{ matrix.target }} + path: deb/debbuild/${{ matrix.target }} + retention-days: 3 From d90ca079dd24acb20e773aa20d838382b15bf5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 4 Sep 2024 11:36:38 +0200 Subject: [PATCH 3/9] nightly: amd64 and arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- .github/workflows/.nightly.yml | 109 +++++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 35 ----------- .github/workflows/nightly.yml | 75 ++++++++++++----------- 3 files changed, 148 insertions(+), 71 deletions(-) create mode 100644 .github/workflows/.nightly.yml delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/.nightly.yml b/.github/workflows/.nightly.yml new file mode 100644 index 0000000000..89faad0b9e --- /dev/null +++ b/.github/workflows/.nightly.yml @@ -0,0 +1,109 @@ +# reusable workflow +name: .build + +# TODO: hide reusable workflow from the UI. Tracked in https://github.com/community/community/discussions/12025 + +# Default to 'contents: read', which grants actions to read commits. +# +# If any permission is set, any permission not included in the list is +# implicitly set to "none". +# +# see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions +permissions: + contents: read + +on: + workflow_call: + inputs: + arch: + required: true + type: string + default: "amd64" + target: + required: true + type: string + image: + required: true + type: string + +jobs: + # Transform the arch into a specific worker + # amd64 -> ubuntu-22.04 + # arm64 -> ubuntu22_arm64 + prepare: + runs-on: ubuntu-22.04 + outputs: + worker: ${{ steps.set.outputs.worker }} + version: ${{ steps.set.outputs.version }} + steps: + - + name: Set worker + id: set + run: | + echo "version=$(date +%Y%m%d)" >> $GITHUB_OUTPUT + case ${{ inputs.arch }} in + amd64) + echo "worker=ubuntu-20.04" >> $GITHUB_OUTPUT + ;; + arm64) + echo "worker=ubuntu22_arm64" >> $GITHUB_OUTPUT + ;; + armhf) + echo "worker=ubuntu22_arm64" >> $GITHUB_OUTPUT + ;; + *) + echo "::error::Unsupported arch: ${{ inputs.arch }}" + exit 1 + ;; + esac + + build: + needs: prepare + runs-on: ${{ needs.prepare.outputs.worker }} + steps: + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - + name: Checkout + uses: actions/checkout@v4 + + - + name: Build + run: | + export VERSION=${{ needs.prepare.outputs.version }} + export REF=master + + export DOCKER_BUILDX_REF=master + export DOCKER_BUILDX_VERSION=$VERSION + + export DOCKER_COMPOSE_REF=main + export DOCKER_COMPOSE_VERSION=$VERSION + + export ARCH=${{ inputs.arch }} + + make ${{ inputs.target }} + + - + name: Verify + run: | + export IMAGE=${{ inputs.image }} + export ARCH=${{ inputs.arch }} + + make verify + + - + name: Artifact deb + uses: actions/upload-artifact@v4 + with: + name: nightly-deb-${{ inputs.target }}-${{ inputs.arch }} + path: deb/debbuild/${{ inputs.target }} + retention-days: 1 + - + name: Artifact rpm + uses: actions/upload-artifact@v4 + with: + name: nightly-rpm-${{ inputs.target }}-${{ inputs.arch }} + path: rpm/rpmbuild/${{ inputs.target }} + retention-days: 1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 9ef7e269cb..0000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: ci - -on: - workflow_dispatch: - push: - branches: - - 'master' - - '[0-9]+.[0-9]{2}' - tags: - - 'v*' - pull_request: - -jobs: - build: - runs-on: ubuntu-20.04 - strategy: - fail-fast: false - matrix: - target: - - debian-bullseye - - debian-bookworm - - ubuntu-focal - - ubuntu-jammy - - ubuntu-noble - steps: - - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Build - run: | - make ${{ matrix.target }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e7e097f5e9..04d5b8717b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,45 +1,48 @@ name: nightly on: - schedule: - - cron: '0 0 * * *' - workflow_dispatch: {} + workflow_dispatch: + pull_request: jobs: - build: - runs-on: selfhosted + packages: strategy: fail-fast: false matrix: - target: - - debian-bookworm - steps: - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + arch: + - amd64 + - arm64 + dist: + #- {target: "debian-bullseye", image: "debian:bullseye"} + - {target: "debian-bookworm", image: "debian:bookworm"} + #- {target: "ubuntu-focal", image: "ubuntu:focal"} + - {target: "ubuntu-jammy", image: "ubuntu:jammy"} + - {target: "ubuntu-noble", image: "ubuntu:noble"} + + - {target: "centos-9", image: "quay.io/centos/centos:stream9"} + #- {target: "fedora-39", image: "fedora:39"} + - {target: "fedora-40", image: "fedora:40"} + #- {target: "rhel-8", image: "registry.access.redhat.com/ubi8/ubi"} + #- {target: "rhel-9", image: "registry.access.redhat.com/ubi9/ubi"} + include: + #- arch: armhf + # dist: {target: "debian-bullseye", image: "debian:bullseye"} + - arch: armhf + dist: {target: "debian-bookworm", image: "debian:bookworm"} + #- arch: armhf + # dist: {target: "ubuntu-focal", image: "ubuntu:focal"} + #- arch: armhf + # dist: {target: "ubuntu-jammy", image: "ubuntu:jammy"} + - arch: armhf + dist: {target: "ubuntu-noble", image: "ubuntu:noble"} + # TODO + # - arch: armhf + # dist: {target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye"} + # - arch: armhf + # dist: {target: "raspbian-bookworm", image: "balenalib/rpi-raspbian:bookworm"} + uses: ./.github/workflows/.nightly.yml + with: + arch: ${{ matrix.arch }} + target: ${{ matrix.dist.target }} + image: ${{ matrix.dist.image }} - - - name: Checkout - uses: actions/checkout@v3 - - - - name: Build - run: | - export VERSION=$(date +%Y%m%d) - export REF=master - - export DOCKER_BUILDX_REF=master - export DOCKER_BUILDX_VERSION=$VERSION - - export DOCKER_COMPOSE_REF=main - export DOCKER_COMPOSE_VERSION=$VERSION - - make ${{ matrix.target }} - - - - name: Artifact - uses: actions/upload-artifact@v2 - with: - name: nightly-${{ matrix.target }} - path: deb/debbuild/${{ matrix.target }} - retention-days: 3 From 8357e3288d8e950b251b7795d8d25119208f4027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 4 Sep 2024 14:09:32 +0200 Subject: [PATCH 4/9] common: allow overriding ARCH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index d10d43f79e..148887507e 100644 --- a/common.mk +++ b/common.mk @@ -1,4 +1,4 @@ -ARCH=$(shell uname -m) +ARCH?=$(shell uname -m) # These are the architecture formats as used in release-packaging Jenkinsfile # This is an ugly chimera, nobody uses this combination of dpkg and uname formats From eb42f5dd7e0ac1453e1ec8edcff2d4b8f1e5ec0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 4 Sep 2024 14:30:15 +0200 Subject: [PATCH 5/9] fix verify armhf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- .github/workflows/.nightly.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/.nightly.yml b/.github/workflows/.nightly.yml index 89faad0b9e..fa291f046f 100644 --- a/.github/workflows/.nightly.yml +++ b/.github/workflows/.nightly.yml @@ -91,6 +91,10 @@ jobs: export IMAGE=${{ inputs.image }} export ARCH=${{ inputs.arch }} + if [ "$ARCH" == "armhf" ]; then + export VERIFY_PLATFORM="--platform linux/arm/v7" + fi + make verify - From b266411ba10ab022bb8432ad81f93570d9cff407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 4 Sep 2024 14:50:54 +0200 Subject: [PATCH 6/9] static MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- .github/workflows/.nightly.yml | 14 ++++++++------ .github/workflows/nightly.yml | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/.nightly.yml b/.github/workflows/.nightly.yml index fa291f046f..d507be7a6a 100644 --- a/.github/workflows/.nightly.yml +++ b/.github/workflows/.nightly.yml @@ -42,13 +42,10 @@ jobs: run: | echo "version=$(date +%Y%m%d)" >> $GITHUB_OUTPUT case ${{ inputs.arch }} in - amd64) + amd64|static) echo "worker=ubuntu-20.04" >> $GITHUB_OUTPUT ;; - arm64) - echo "worker=ubuntu22_arm64" >> $GITHUB_OUTPUT - ;; - armhf) + arm64|armhf) echo "worker=ubuntu22_arm64" >> $GITHUB_OUTPUT ;; *) @@ -81,12 +78,17 @@ jobs: export DOCKER_COMPOSE_REF=main export DOCKER_COMPOSE_VERSION=$VERSION - export ARCH=${{ inputs.arch }} + if [ "${{ inputs.target }}" == "static" ]; then + export DOCKER_BUILD_PKGS="static-linux cross-mac cross-win" + else + export ARCH=${{ inputs.arch }} + fi make ${{ inputs.target }} - name: Verify + if: ${{ inputs.image != '' }} run: | export IMAGE=${{ inputs.image }} export ARCH=${{ inputs.arch }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 04d5b8717b..4230cada1f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -16,25 +16,27 @@ jobs: #- {target: "debian-bullseye", image: "debian:bullseye"} - {target: "debian-bookworm", image: "debian:bookworm"} #- {target: "ubuntu-focal", image: "ubuntu:focal"} - - {target: "ubuntu-jammy", image: "ubuntu:jammy"} - - {target: "ubuntu-noble", image: "ubuntu:noble"} + #- {target: "ubuntu-jammy", image: "ubuntu:jammy"} + #- {target: "ubuntu-noble", image: "ubuntu:noble"} - - {target: "centos-9", image: "quay.io/centos/centos:stream9"} + #- {target: "centos-9", image: "quay.io/centos/centos:stream9"} #- {target: "fedora-39", image: "fedora:39"} - - {target: "fedora-40", image: "fedora:40"} + #- {target: "fedora-40", image: "fedora:40"} #- {target: "rhel-8", image: "registry.access.redhat.com/ubi8/ubi"} #- {target: "rhel-9", image: "registry.access.redhat.com/ubi9/ubi"} include: + - arch: static + dist: {target: "static", image: ""} #- arch: armhf # dist: {target: "debian-bullseye", image: "debian:bullseye"} - - arch: armhf - dist: {target: "debian-bookworm", image: "debian:bookworm"} + #- arch: armhf + # dist: {target: "debian-bookworm", image: "debian:bookworm"} #- arch: armhf # dist: {target: "ubuntu-focal", image: "ubuntu:focal"} #- arch: armhf # dist: {target: "ubuntu-jammy", image: "ubuntu:jammy"} - - arch: armhf - dist: {target: "ubuntu-noble", image: "ubuntu:noble"} + #- arch: armhf + # dist: {target: "ubuntu-noble", image: "ubuntu:noble"} # TODO # - arch: armhf # dist: {target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye"} From 83590816596e850749eedf12a6d86a8575bc6f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 4 Sep 2024 17:51:13 +0200 Subject: [PATCH 7/9] remove cross-arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 39bfa7276f..6bd0c0db60 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ debian-% raspbian-% ubuntu-%: checkout ## build deb packages for the specified d $(MAKE) -C deb VERSION=$(VERSION) GO_VERSION=$(GO_VERSION) $@ .PHONY: static -static: DOCKER_BUILD_PKGS:=static-linux cross-mac cross-win cross-arm +static: DOCKER_BUILD_PKGS:=static-linux cross-mac cross-win static: checkout ## build static-compiled packages for p in $(DOCKER_BUILD_PKGS); do \ $(MAKE) -C $@ VERSION=$(VERSION) GO_VERSION=$(GO_VERSION) TARGETPLATFORM=$(TARGETPLATFORM) CONTAINERD_VERSION=$(CONTAINERD_VERSION) RUNC_VERSION=$(RUNC_VERSION) $${p}; \ From 23d56599149918c966ce07d33a3bbbeeec4ce4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Thu, 5 Sep 2024 12:58:04 +0200 Subject: [PATCH 8/9] single artifact job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- .github/workflows/.nightly.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/.nightly.yml b/.github/workflows/.nightly.yml index d507be7a6a..a3100dda71 100644 --- a/.github/workflows/.nightly.yml +++ b/.github/workflows/.nightly.yml @@ -103,13 +103,9 @@ jobs: name: Artifact deb uses: actions/upload-artifact@v4 with: - name: nightly-deb-${{ inputs.target }}-${{ inputs.arch }} - path: deb/debbuild/${{ inputs.target }} - retention-days: 1 - - - name: Artifact rpm - uses: actions/upload-artifact@v4 - with: - name: nightly-rpm-${{ inputs.target }}-${{ inputs.arch }} - path: rpm/rpmbuild/${{ inputs.target }} + name: nightly-${{ inputs.target }}-${{ inputs.arch }} + path: | + deb/debbuild/${{ inputs.target }} + rpm/rpmbuild/${{ inputs.target }} + static/build retention-days: 1 From 52d14dc8add3b006248dd54caa8ac2c68cac5867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Thu, 5 Sep 2024 16:24:23 +0200 Subject: [PATCH 9/9] static: split artifacts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- .github/workflows/.nightly.yml | 8 ++++---- .github/workflows/nightly.yml | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/.nightly.yml b/.github/workflows/.nightly.yml index a3100dda71..5ec853e71b 100644 --- a/.github/workflows/.nightly.yml +++ b/.github/workflows/.nightly.yml @@ -42,7 +42,7 @@ jobs: run: | echo "version=$(date +%Y%m%d)" >> $GITHUB_OUTPUT case ${{ inputs.arch }} in - amd64|static) + amd64|static*|cross*) echo "worker=ubuntu-20.04" >> $GITHUB_OUTPUT ;; arm64|armhf) @@ -78,10 +78,10 @@ jobs: export DOCKER_COMPOSE_REF=main export DOCKER_COMPOSE_VERSION=$VERSION - if [ "${{ inputs.target }}" == "static" ]; then - export DOCKER_BUILD_PKGS="static-linux cross-mac cross-win" + if [ "${{ inputs.target }}" == static ]; then + export DOCKER_BUILD_PKGS="${{ inputs.arch }}" else - export ARCH=${{ inputs.arch }} + export ARCH=${{ inputs.arch }} fi make ${{ inputs.target }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4230cada1f..f557f2e307 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -25,13 +25,17 @@ jobs: #- {target: "rhel-8", image: "registry.access.redhat.com/ubi8/ubi"} #- {target: "rhel-9", image: "registry.access.redhat.com/ubi9/ubi"} include: - - arch: static + - arch: static-linux dist: {target: "static", image: ""} + - arch: cross-mac + dist: {target: "static", image: ""} + - arch: cross-win + dist: {target: "static", image: ""} + - arch: armhf + dist: {target: "debian-bookworm", image: "debian:bookworm"} #- arch: armhf # dist: {target: "debian-bullseye", image: "debian:bullseye"} #- arch: armhf - # dist: {target: "debian-bookworm", image: "debian:bookworm"} - #- arch: armhf # dist: {target: "ubuntu-focal", image: "ubuntu:focal"} #- arch: armhf # dist: {target: "ubuntu-jammy", image: "ubuntu:jammy"}