forked from rpms/leapp-repository
66 lines
2.6 KiB
Diff
66 lines
2.6 KiB
Diff
|
From 035f5a9cfdc74e760cc39a32769296466cb04ff5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Inessa Vasilevskaya <ivasilev@redhat.com>
|
||
|
|
Date: Thu, 13 Apr 2023 19:50:55 +0200
|
||
|
|
Subject: [PATCH 10/30] 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 | 10 ++++++----
|
||
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/.github/workflows/reuse-copr-build.yml b/.github/workflows/reuse-copr-build.yml
|
||
|
|
index eb700df4..093e0c1a 100644
|
||
|
|
--- a/.github/workflows/reuse-copr-build.yml
|
||
|
|
+++ b/.github/workflows/reuse-copr-build.yml
|
||
|
|
@@ -57,18 +57,19 @@ jobs:
|
||
|
|
env:
|
||
|
|
COPR_CONFIG: "copr_fedora.conf"
|
||
|
|
COPR_CHROOT: "epel-7-x86_64,epel-8-x86_64"
|
||
|
|
+ COPR_REPO: "@oamg/leapp"
|
||
|
|
run: |
|
||
|
|
cat << EOF > $COPR_CONFIG
|
||
|
|
[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_CONFIG COPR_CHROOT=$COPR_CHROOT make copr_build | tee copr.log
|
||
|
|
+ PR=${{ steps.pr_nr.outputs.pr_nr }} COPR_CONFIG=$COPR_CONFIG COPR_REPO="$COPR_REPO" COPR_CHROOT=$COPR_CHROOT 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}"
|
||
|
|
@@ -122,18 +123,19 @@ jobs:
|
||
|
|
env:
|
||
|
|
COPR_CONFIG: "copr_fedora.conf"
|
||
|
|
COPR_CHROOT: "epel-7-x86_64,epel-8-x86_64"
|
||
|
|
+ COPR_REPO: "@oamg/leapp"
|
||
|
|
run: |
|
||
|
|
cat << EOF > $COPR_CONFIG
|
||
|
|
[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.leapp_pr.outputs.leapp_pr }} COPR_CONFIG=$COPR_CONFIG COPR_CHROOT=$COPR_CHROOT make copr_build | tee copr.log
|
||
|
|
+ PR=${{ steps.leapp_pr.outputs.leapp_pr }} COPR_CONFIG=$COPR_CONFIG COPR_REPO="$COPR_REPO" COPR_CHROOT=$COPR_CHROOT 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.40.1
|
||
|
|
|