From 5ef3f2ff5c7723a4b741bf9f9f947dfe801505dd Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Thu, 3 Jul 2025 13:08:34 -0400 Subject: [PATCH] ci(copr): refactor copr-ci (#4043) --- .github/workflows/ci-copr.yml | 19 +++++++------- .github/workflows/ci.yml | 48 +++++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-copr.yml b/.github/workflows/ci-copr.yml index d30e4d41..f97400de 100644 --- a/.github/workflows/ci-copr.yml +++ b/.github/workflows/ci-copr.yml @@ -1,23 +1,24 @@ --- -name: CI Copr +name: CI-Copr permissions: contents: read on: - pull_request: - branches: - - master - types: - - opened - - synchronize - - reopened release: types: - prereleased - released + workflow_call: + secrets: + COPR_BETA_WEBHOOK_TOKEN: + required: false + COPR_STABLE_WEBHOOK_TOKEN: + required: false + COPR_CLI_CONFIG: + required: false concurrency: - group: "${{ github.workflow }}-${{ github.ref }}" + group: "_${{ github.workflow }}-${{ github.ref }}" cancel-in-progress: true jobs: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a50487d3..6a390ca3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: GH_BOT_TOKEN: ${{ secrets.GH_BOT_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - build_homebrew: + build-homebrew: name: Homebrew needs: release-setup uses: ./.github/workflows/ci-homebrew.yml @@ -81,15 +81,7 @@ jobs: GIT_EMAIL: ${{ secrets.GH_BOT_EMAIL }} GIT_USERNAME: ${{ secrets.GH_BOT_NAME }} - build_linux_flatpak: - name: Linux Flatpak - needs: release-setup - uses: ./.github/workflows/ci-flatpak.yml - with: - release_commit: ${{ needs.release-setup.outputs.release_commit }} - release_tag: ${{ needs.release-setup.outputs.release_tag }} - - build_linux: + build-linux: name: Linux needs: release-setup uses: ./.github/workflows/ci-linux.yml @@ -97,7 +89,24 @@ jobs: release_commit: ${{ needs.release-setup.outputs.release_commit }} release_tag: ${{ needs.release-setup.outputs.release_tag }} - build_windows: + build-linux-copr: + name: Linux Copr + needs: release-setup + uses: ./.github/workflows/ci-copr.yml + secrets: + COPR_BETA_WEBHOOK_TOKEN: ${{ secrets.COPR_BETA_WEBHOOK_TOKEN }} + COPR_STABLE_WEBHOOK_TOKEN: ${{ secrets.COPR_STABLE_WEBHOOK_TOKEN }} + COPR_CLI_CONFIG: ${{ secrets.COPR_CLI_CONFIG }} + + build-linux-flatpak: + name: Linux Flatpak + needs: release-setup + uses: ./.github/workflows/ci-flatpak.yml + with: + release_commit: ${{ needs.release-setup.outputs.release_commit }} + release_tag: ${{ needs.release-setup.outputs.release_tag }} + + build-windows: name: Windows needs: release-setup uses: ./.github/workflows/ci-windows.yml @@ -114,10 +123,10 @@ jobs: !cancelled() && startsWith(github.repository, 'LizardByte/') needs: - - build_linux - - build_linux_flatpak - - build_homebrew - - build_windows + - build-linux + - build-linux-flatpak + - build-homebrew + - build-windows runs-on: ubuntu-latest strategy: fail-fast: false @@ -174,10 +183,11 @@ jobs: needs: - release-setup - build-docker - - build_linux - - build_linux_flatpak - - build_homebrew - - build_windows + - build-linux + - build-linux-copr + - build-linux-flatpak + - build-homebrew + - build-windows runs-on: ubuntu-latest steps: - name: Download build artifacts