Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wlrfx/packages
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ef550248aa3a029de37a604ac8288303757530b6
Choose a base ref
..
head repository: wlrfx/packages
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cda41ac1097c0410f11c672bdeee9e055b19e830
Choose a head ref
Showing with 26 additions and 52 deletions.
  1. +26 −6 .github/workflows/{copr_build_swayfx.yml → copr_build.yml}
  2. +0 −45 .github/workflows/copr_build_scenefx.yml
  3. +0 −1 .github/workflows/copr_upload.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build SwayFX RPM
name: Build RPMs

on:
push:
@@ -14,11 +14,10 @@ on:
workflow_dispatch:

jobs:
RPM-build-swayfx:
RPM-build:
name: Build RPM swayfx
container: fedora:latest
runs-on: ubuntu-latest
uses: wlrfx/aur-packages/.github/workflows/copr_build_scenefx.yml@main
steps:
- name: Install tooling for source RPM build
run: |
@@ -29,17 +28,38 @@ jobs:
with:
fetch-depth: 0

- name: Download RPM Spec sources
- name: SceneFX Download RPM Spec sources
run: |
cd COPR/scenefx
spectool -g ./scenefx.rpkg.spec
- name: SceneFX Install build dependencies
run: |
cd COPR/scenefx
dnf -y builddep ./scenefx.rpkg.spec
- name: SceneFX Build RPM
run: |
cd COPR/scenefx
mkdir -p out
rpkg local --out `pwd`/out
- name: SceneFX Install RPMs
run: |
cd COPR/scenefx
dnf -y install ./out/**/*.rpm
- name: SwayFX Download RPM Spec sources
run: |
cd COPR/swayfx
spectool -g ./swayfx.rpkg.spec
- name: Install build dependencies
- name: SwayFX Install build dependencies
run: |
cd COPR/swayfx
dnf -y builddep ./swayfx.rpkg.spec
- name: Build RPM
- name: SwayFX Build RPM
run: |
cd COPR/swayfx
mkdir -p out
45 changes: 0 additions & 45 deletions .github/workflows/copr_build_scenefx.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/copr_upload.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@ jobs:

container: fedora:latest
runs-on: ubuntu-latest
needs: RPM-build-${{matrix.pkgname}}
steps:
- name: Install API token for copr-cli
env: