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
76 lines
3.0 KiB
Diff
76 lines
3.0 KiB
Diff
From 5ddce5a248ec59d6f8294aae95b5ce6732464acc Mon Sep 17 00:00:00 2001
|
|
From: Inessa Vasilevskaya <ivasilev@redhat.com>
|
|
Date: Thu, 13 Apr 2023 19:52:56 +0200
|
|
Subject: [PATCH 02/18] Make copr-build functioning again
|
|
|
|
After some unknown changes around COPR, the building
|
|
command and the used COPR configuration file needs to be
|
|
updated.
|
|
|
|
OAMG-8876
|
|
---
|
|
.github/workflows/reuse-copr-build.yml | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/.github/workflows/reuse-copr-build.yml b/.github/workflows/reuse-copr-build.yml
|
|
index 19b17ca..138c403 100644
|
|
--- a/.github/workflows/reuse-copr-build.yml
|
|
+++ b/.github/workflows/reuse-copr-build.yml
|
|
@@ -66,7 +66,7 @@ jobs:
|
|
cat << EOF > copr_fedora.conf
|
|
[copr-cli]
|
|
login = ${{ secrets.FEDORA_COPR_LOGIN }}
|
|
- username = @oamg
|
|
+ username = oamgbot
|
|
token = ${{ secrets.FEDORA_COPR_TOKEN }}
|
|
copr_url = https://copr.fedorainfracloud.org
|
|
# expiration date: 2030-07-04
|
|
@@ -79,18 +79,22 @@ jobs:
|
|
|
|
- name: Trigger copr build
|
|
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
|
|
[copr-cli]
|
|
login = ${{ secrets.FEDORA_COPR_LOGIN }}
|
|
- username = @oamg
|
|
+ username = oamgbot
|
|
token = ${{ secrets.FEDORA_COPR_TOKEN }}
|
|
copr_url = https://copr.fedorainfracloud.org
|
|
# expiration date: 2030-07-04
|
|
EOF
|
|
|
|
pip install copr-cli
|
|
- PR=${{ steps.pr_nr.outputs.pr_nr }} COPR_CONFIG=copr_fedora.conf make copr_build | tee copr.log
|
|
+ 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
|
|
|
|
COPR_URL=$(grep -Po 'https://copr.fedorainfracloud.org/coprs/build/\d+' copr.log)
|
|
echo "::set-output name=copr_url::${COPR_URL}"
|
|
@@ -133,6 +137,10 @@ jobs:
|
|
- name: Trigger copr build for leapp-repository
|
|
id: copr_build_leapp_repository
|
|
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
|
|
[copr-cli]
|
|
@@ -144,7 +152,7 @@ jobs:
|
|
EOF
|
|
|
|
pip install copr-cli
|
|
- PR=${{ steps.leapp_repository_pr.outputs.leapp_repository_pr }} COPR_CONFIG=copr_fedora.conf make copr_build | tee copr.log
|
|
+ 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
|
|
|
|
COPR_URL=$(grep -Po 'https://copr.fedorainfracloud.org/coprs/build/\d+' copr.log)
|
|
echo "::set-output name=copr_url::${COPR_URL}"
|
|
--
|
|
2.41.0
|
|
|