From 59004205dab91c66aa2096f9417587081f9d26ed Mon Sep 17 00:00:00 2001 From: Isa Farnik Date: Thu, 5 Sep 2024 12:08:49 -0700 Subject: [PATCH] wip --- .github/matrix-commitly.yml | 3 ++- .github/workflows/release.yml | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/matrix-commitly.yml b/.github/matrix-commitly.yml index f819d85138d9..1a2962ab225f 100644 --- a/.github/matrix-commitly.yml +++ b/.github/matrix-commitly.yml @@ -3,13 +3,14 @@ build-packages: - label: ubuntu-24.04 image: ubuntu:24.04 package: deb - check-manifest-suite: docker-image-ubuntu-24.04 + check-manifest-suite: ubuntu-24.04-amd64 build-images: - label: ubuntu base-image: ubuntu:24.04 package: deb artifact-from: ubuntu-24.04 + check-manifest-suite: docker-image-ubuntu-24.04 smoke-tests: - label: ubuntu diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b6e16e78918..94192420cf32 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -419,12 +419,9 @@ jobs: cache: 'pip' # caching pip dependencies - name: Verify + env: + SUITE: ${{ matrix.check-manifest-suite || 'docker-image' }} run: | - SUITE='docker-image' - if [ -n '${{ matrix.check-manifest-suite }}' ]; then - SUITE='${{ matrix.check-manifest-suite }}' - fi - cd scripts/explain_manifest # docker image verify requires sudo to set correct permissions, so we # also install deps for root