Deduplication of copr_project_tpl in matrix

fedora-llvm-team · Dec 17, 2024 · c1504d8 · c1504d8
1 parent aed3ca1
commit c1504d8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/actions/generate-matrix/action.yml b/.github/actions/generate-matrix/action.yml
@@ -25,7 +25,6 @@ runs:
         BIG_MERGE_CONFIG=$(jq -c <<EOF
           {
               "name": "big-merge",
-              "copr_project_tpl": "@fedora-llvm-team/llvm-snapshots-big-merge-YYYYMMDD",
               "copr_target_project": "@fedora-llvm-team/llvm-snapshots",
               "clone_url_tpl": "https://src.fedoraproject.org/rpms/PKG.git",
               "clone_ref": "rawhide",
@@ -42,7 +41,6 @@ runs:
         PGO_CONFIG=$(jq -c <<EOF
           {
             "name": "pgo",
-            "copr_project_tpl": "@fedora-llvm-team/llvm-snapshots-pgo-YYYYMMDD",
             "copr_target_project": "@fedora-llvm-team/llvm-snapshots-pgo",
             "extra_script_file": "scripts/functions-pgo.sh",
             "clone_url_tpl": "https://src.fedoraproject.org/forks/kkleine/rpms/PKG.git",

diff --git a/.github/workflows/check-snapshots.yml b/.github/workflows/check-snapshots.yml
@@ -94,6 +94,7 @@ jobs:
             --maintainer-handle ${{matrix.maintainer_handle}} \
             --packages ${{matrix.packages}} \
             --build-strategy ${{matrix.name}} \
+            --copr-ownername ${{matrix.copr_ownername}} \
             --copr-project-tpl ${{matrix.copr_project_tpl}} \
             --copr-monitor-tpl ${{matrix.copr_monitor_tpl}} \
             --yyyymmdd $yyyymmdd
diff --git a/.github/workflows/fedora-copr-build.yml b/.github/workflows/fedora-copr-build.yml
@@ -70,8 +70,8 @@ jobs:
           echo "packages=$packages" >> $GITHUB_ENV
           echo "chroots=$chroots" >> $GITHUB_ENV
           echo "all_chroots=$all_chroots" >> $GITHUB_ENV
-          echo "project_today=${{ matrix.copr_project_tpl }}" | sed "s/YYYYMMDD/$today/" >> $GITHUB_ENV
-          echo "project_yesterday=${{ matrix.copr_project_tpl }}" | sed "s/YYYYMMDD/$yesterday/" >> $GITHUB_ENV
+          echo "project_today=${{ matrix.copr_ownername }}/${{ matrix.copr_project_tpl }}" | sed "s/YYYYMMDD/$today/" >> $GITHUB_ENV
+          echo "project_yesterday=${{ matrix.copr_ownername }}/${{ matrix.copr_project_tpl }}" | sed "s/YYYYMMDD/$yesterday/" >> $GITHUB_ENV
           echo "project_target=${{ matrix.copr_target_project }}" >> $GITHUB_ENV
 
       - name: "Check for Copr projects existence (yesterday, today, target)"