From bc025385e2102a3b0590e5915e23cbce199cd304 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:52:28 -0400 Subject: [PATCH] ci(copr): use copr-ci workflow --- .github/workflows/ci-copr.yml | 52 ++++------------ .../fedora/{sunshine.spec => Sunshine.spec} | 2 +- packaging/linux/fedora/copr-build.sh | 62 ------------------- 3 files changed, 13 insertions(+), 103 deletions(-) rename packaging/linux/fedora/{sunshine.spec => Sunshine.spec} (100%) delete mode 100644 packaging/linux/fedora/copr-build.sh diff --git a/.github/workflows/ci-copr.yml b/.github/workflows/ci-copr.yml index 782246f6aad..db02c9123dc 100644 --- a/.github/workflows/ci-copr.yml +++ b/.github/workflows/ci-copr.yml @@ -13,49 +13,21 @@ on: types: - prereleased - released - workflow_dispatch: concurrency: group: "${{ github.workflow }}-${{ github.ref }}" cancel-in-progress: true jobs: - build: - name: Copr build - if: github.repository_owner == 'LizardByte' - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Get properties - env: - COPR_PR_WH_KEY: "05fc9b07-a19b-4f83-89b2-ae1e7e0b5282" - run: | - # package name = repository name - package=${{ github.event.repository.name }} - copr_base="https://copr.fedorainfracloud.org/webhooks/custom-dir/lizardbyte" - - # release and released type - if [ "${{ github.event_name }}" = "release" ]; then - if [ "${{ github.event.action }}" = "prereleased" ]; then - COPR_PUSH_WEBHOOK="${copr_base}/beta/${{ secrets.COPR_BETA_WEBHOOK_TOKEN }}/${package}/" - elif [ "${{ github.event.action }}" = "released" ]; then - COPR_PUSH_WEBHOOK="${copr_base}/stable/${{ secrets.COPR_STABLE_WEBHOOK_TOKEN }}/${package}/" - fi - elif [ "${{ github.event_name }}" = "pull_request" ]; then - COPR_PR_WEBHOOK="${copr_base}/pulls:pr:${{github.event.number}}/${{env.COPR_PR_WH_KEY}}/${package}/" - fi - - echo "COPR_PUSH_WEBHOOK=${COPR_PUSH_WEBHOOK}" >> $GITHUB_ENV - echo "COPR_PR_WEBHOOK=${COPR_PR_WEBHOOK}" >> $GITHUB_ENV - - echo "COPR_PUSH_WEBHOOK=${COPR_PUSH_WEBHOOK}" - echo "COPR_PR_WEBHOOK=${COPR_PR_WEBHOOK}" - - - name: Build - run: | - curl https://raw.githubusercontent.com/praiskup/copr-ci-tooling/main/copr-gh-actions-submit > submit - - # if a PR number is added the script will use the PR webhook, otherwise it will use the push webhook - bash submit ${{ github.event.pull_request.number }} + call-copr-ci: + uses: LizardByte/copr-ci/.github/workflows/copr-ci.yml@master + with: + copr_pr_webhook_token: "05fc9b07-a19b-4f83-89b2-ae1e7e0b5282" + github_org_owner: LizardByte + copr_ownername: lizardbyte + auto_update_package: true + job_timeout: 60 + 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 }} diff --git a/packaging/linux/fedora/sunshine.spec b/packaging/linux/fedora/Sunshine.spec similarity index 100% rename from packaging/linux/fedora/sunshine.spec rename to packaging/linux/fedora/Sunshine.spec index e17e213bb36..73afe05083d 100644 --- a/packaging/linux/fedora/sunshine.spec +++ b/packaging/linux/fedora/Sunshine.spec @@ -9,8 +9,8 @@ Name: Sunshine Version: %{build_version} -Summary: Self-hosted game stream host for Moonlight. Release: 1%{?dist} +Summary: Self-hosted game stream host for Moonlight. License: GPLv3-only URL: https://github.com/LizardByte/Sunshine Source0: tarball.tar.gz diff --git a/packaging/linux/fedora/copr-build.sh b/packaging/linux/fedora/copr-build.sh deleted file mode 100644 index 3aa8bb83b73..00000000000 --- a/packaging/linux/fedora/copr-build.sh +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -x - -# This file is not used directly in this repository. It should be uploaded to Copr whenever the file changes. -# Replicate to each package in "pulls", "beta", and "stable" Copr repositories - -set -e -resultdir="${COPR_RESULTDIR}" -git clone "https://github.com/${COPR_OWNER}/${COPR_PACKAGE}.git" --depth 1 -cd "${COPR_PACKAGE}" - -# optional part; drop if building against 'master' is enough -if test -z "$REVISION"; then - # the hook_payload file contains webhook JSON payload (copr creates it for - # us); it is created only if the build is triggered by Custom webhook. - if test -f "$resultdir"/hook_payload; then - git clone https://github.com/praiskup/copr-ci-tooling \ - "$resultdir/cct" --depth 1 - export PATH="$resultdir/cct:$PATH" - - echo "---" - cat "$resultdir"/hook_payload - echo "---" - - # use jq to get the pr_id from the hook_payload - PR=$(jq -r '.pr_id' "$resultdir"/hook_payload) - if [ -z "$PR" ]; then - BRANCH="master" - else - BRANCH="pr/${PR}" - fi - - copr-travis-checkout "$resultdir"/hook_payload - fi -else - git checkout "$REVISION" -fi - -# initialize the submodules -git submodule update --init --recursive - -# get the tag of this commit IF it has one -TAG=$(git tag --points-at HEAD | head -n1) -if [ -z "$TAG" ]; then - TAG="0.0.$PR" -fi -TAG=$(echo "$TAG" | sed 's/^v//') # remove v prefix from the tag -echo "TAG=$TAG" - -# get the commit -COMMIT=$(git rev-parse HEAD) -echo "COMMIT=$COMMIT" - -# move spec file to the correct location -mv packaging/linux/fedora/*.spec "${resultdir}" - -# use sed to replace these values in the spec file -sed -i "s|%global build_version 0|%global build_version ${TAG}|" "${resultdir}"/*.spec -sed -i "s|%global branch 0|%global branch ${BRANCH}|" "${resultdir}"/*.spec -sed -i "s|%global commit 0|%global commit ${COMMIT}|" "${resultdir}"/*.spec - -# create a tarball of the source code -tar -czf "${resultdir}/tarball.tar.gz" .