From 471f8bd02d045744244858ddbb5c2ab89c42810b Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Fri, 7 Feb 2025 11:45:23 -0300 Subject: [PATCH] Assume that env.packages stores a single package Stop using variable after_build_id in order to fix a non-issue reported by shellcheck. We now assume that env.packages stores a single package. This has been true for the past months. Fixes: 68b3e36 (Introduce github action linting in pre-commit, 2025-02-05) --- .github/workflows/fedora-copr-build.yml | 30 +++++++++++-------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/fedora-copr-build.yml b/.github/workflows/fedora-copr-build.yml index 19e9eba5..3620f834 100644 --- a/.github/workflows/fedora-copr-build.yml +++ b/.github/workflows/fedora-copr-build.yml @@ -188,23 +188,19 @@ jobs: [[ -n "${{ matrix.extra_script_file }}" ]] && source ${{ matrix.extra_script_file }} for chroot in ${{ env.chroots }}; do - # Start a new batch - after_build_id="" - for pkg in ${{ env.packages }}; do - if ! is_package_supported_by_chroot "${pkg}" "${chroot}"; then - echo "Package '${pkg}' is not supported by chroot: ${chroot}"; - else - copr build-package \ - --timeout $((30*3600)) \ - --nowait \ - --name "$pkg" "${after_build_id}" \ - --chroot "${chroot}" \ - ${{ env.project_today }} \ - | tee "${pkg}.log" - - after_build_id="--after-build-id $(grep -Po 'Created builds: \K(\d+)' "${pkg}.log")" - fi - done + # Previously env.packages could store a list of packages. + # We know assume it has a single package. + if ! is_package_supported_by_chroot "${{ env.packages }}" "${chroot}"; then + echo "Package '${{ env.packages }}' is not supported by chroot: ${chroot}"; + else + copr build-package \ + --timeout $((30*3600)) \ + --nowait \ + --name "${{ env.packages }}" \ + --chroot "${chroot}" \ + ${{ env.project_today }} \ + | tee "${{ env.packages }}.log" + fi done - name: "Delete target Copr project at ${{ env.project_target }} before forking to it"