diff --git a/.gitea/workflows/copr-dispatch.yaml b/.gitea/workflows/copr-dispatch.yaml index d0dbee9..3058706 100644 --- a/.gitea/workflows/copr-dispatch.yaml +++ b/.gitea/workflows/copr-dispatch.yaml @@ -1,5 +1,5 @@ -name: Build and provide rpm of gitea -run-name: Build gitea from $${{ gitea.repository }} on COPR by $${{ github.actor }} +name: Build and provide rpm of ${REPO_NAME} +run-name: Build ${REPO_NAME} from $${{ gitea.repository }} on COPR by $${{ github.actor }} on: workflow_dispatch: inputs: @@ -8,8 +8,14 @@ on: description: "Choose a fedora version" required: true options: [ f42, f43, rawhide ] + coprproject: + type: choice + description: "Which repo" + required: true + options: [ packages, packages-test ] jobs: - rpmbuild: + coprbuild: + name: Build src rpm and send it to COPR runs-on: $${{ inputs.fedoraversion }}-minimal-copr steps: - name: Check out repository code @@ -18,5 +24,5 @@ jobs: uses: https://git.demus.dk/actions/copr-build@main with: copr_config: $${{ secrets.COPR_API_CONFIG }} - copr_project: packages + copr_project: $${{ inputs.coprproject }} fedora_release: $${{ inputs.fedoraversion }} diff --git a/.gitea/workflows/copr-build.yaml b/.gitea/workflows/copr-release.yaml similarity index 91% rename from .gitea/workflows/copr-build.yaml rename to .gitea/workflows/copr-release.yaml index 013606d..7667e74 100644 --- a/.gitea/workflows/copr-build.yaml +++ b/.gitea/workflows/copr-release.yaml @@ -2,7 +2,8 @@ name: Build and provide rpm of ${REPO_NAME} run-name: Build ${REPO_NAME} from $${{ gitea.repository }} on COPR by $${{ github.actor }} on: [release] jobs: - rpmbuild: + coprbuild: + name: Build src rpm and send it to COPR strategy: matrix: fedoraversion: [ f42, f43, rawhide ] diff --git a/.gitea/workflows/rpmbuild-dispatch.yaml b/.gitea/workflows/rpmbuild-dispatch.yaml index 3c300ce..f8f7130 100644 --- a/.gitea/workflows/rpmbuild-dispatch.yaml +++ b/.gitea/workflows/rpmbuild-dispatch.yaml @@ -3,14 +3,15 @@ run-name: Rpmbuild ${REPO_NAME} at $${{ gitea.repository }} by $${{ github.actor on: workflow_dispatch: inputs: - runsonlabel: + fedoraversion: type: choice description: "Choose a fedora version" required: true options: [ f42, f43, rawhide ] jobs: rpmbuild: - runs-on: $${{ inputs.runsonlabel }}-minimal-rpmbuild + name: Build and deploy an rpm to the demus.dk repo + runs-on: $${{ inputs.fedoraversion }}-minimal-rpmbuild steps: - name: Check out repository code uses: https://git.demus.dk/actions/git-clone@main diff --git a/.gitea/workflows/rpmbuild-release.yaml b/.gitea/workflows/rpmbuild-release.yaml index ce84873..a5726ef 100644 --- a/.gitea/workflows/rpmbuild-release.yaml +++ b/.gitea/workflows/rpmbuild-release.yaml @@ -3,10 +3,11 @@ run-name: Rpmbuild ${REPO_NAME} by $${{ github.actor }} by $${{ github.actor }} on: [ release ] jobs: rpmbuild: + name: Build and deploy an rpm to the demus.dk repo strategy: matrix: - rpmbuilder: [ f42, f43, rawhide ] - runs-on: $${{ matrix.rpmbuilder }}-minimal-rpmbuild + fedoraversion: [ f42, f43, rawhide ] + runs-on: $${{ matrix.fedoraversion }}-minimal-rpmbuild steps: - name: Check out repository code uses: https://git.demus.dk/actions/git-clone@main