257b6fe19e
- Bump leapp-framework to 4.0 - Improve the report summary output to make it more visible - Fix processing data in remediation instructions with non-ascii characters - Fix creation of Dialog for Component without choices - Store tracebacks from actors in leapp.db - Resolves: #2223312
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
From f4a5a3c7f94f436b6814945539a562cbe5d25e87 Mon Sep 17 00:00:00 2001
|
|
From: Inessa Vasilevskaya <ivasilev@redhat.com>
|
|
Date: Fri, 14 Apr 2023 14:26:21 +0200
|
|
Subject: [PATCH 03/18] Do not set COPR_CHROOTS for copr-build
|
|
|
|
Previous patch follow up: in case of leapp this
|
|
should not be specified.
|
|
|
|
OAMG-8876
|
|
---
|
|
.github/workflows/reuse-copr-build.yml | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/.github/workflows/reuse-copr-build.yml b/.github/workflows/reuse-copr-build.yml
|
|
index 138c403..76c1f67 100644
|
|
--- a/.github/workflows/reuse-copr-build.yml
|
|
+++ b/.github/workflows/reuse-copr-build.yml
|
|
@@ -81,7 +81,6 @@ jobs:
|
|
id: copr_build
|
|
env:
|
|
COPR_CONFIG: "copr_fedora.conf"
|
|
- COPR_CHROOT: "epel-7-x86_64,epel-8-x86_64"
|
|
COPR_REPO: "@oamg/leapp"
|
|
run: |
|
|
cat << EOF > copr_fedora.conf
|
|
@@ -94,7 +93,7 @@ jobs:
|
|
EOF
|
|
|
|
pip install copr-cli
|
|
- PR=${{ steps.pr_nr.outputs.pr_nr }} COPR_CHROOT=$COPR_CHROOT COPR_REPO="$COPR_REPO" COPR_CONFIG=$COPR_CONFIG make copr_build | tee copr.log
|
|
+ PR=${{ steps.pr_nr.outputs.pr_nr }} COPR_REPO="$COPR_REPO" COPR_CONFIG=$COPR_CONFIG make copr_build | tee copr.log
|
|
|
|
COPR_URL=$(grep -Po 'https://copr.fedorainfracloud.org/coprs/build/\d+' copr.log)
|
|
echo "::set-output name=copr_url::${COPR_URL}"
|
|
@@ -139,7 +138,6 @@ jobs:
|
|
if: ${{ steps.leapp_repository_pr_regex_match.outputs.match != '' }}
|
|
env:
|
|
COPR_CONFIG: "copr_fedora.conf"
|
|
- COPR_CHROOT: "epel-7-x86_64,epel-8-x86_64"
|
|
COPR_REPO: "@oamg/leapp"
|
|
run: |
|
|
cat << EOF > copr_fedora.conf
|
|
@@ -152,7 +150,7 @@ jobs:
|
|
EOF
|
|
|
|
pip install copr-cli
|
|
- PR=${{ steps.leapp_repository_pr.outputs.leapp_repository_pr }} COPR_CHROOT=COPR_CHROOT COPR_REPO="$COPR_REPO" COPR_CONFIG=$COPR_CONFIG make copr_build | tee copr.log
|
|
+ PR=${{ steps.leapp_repository_pr.outputs.leapp_repository_pr }} COPR_REPO="$COPR_REPO" COPR_CONFIG=$COPR_CONFIG make copr_build | tee copr.log
|
|
|
|
COPR_URL=$(grep -Po 'https://copr.fedorainfracloud.org/coprs/build/\d+' copr.log)
|
|
echo "::set-output name=copr_url::${COPR_URL}"
|
|
--
|
|
2.41.0
|
|
|