diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/publish.yml /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/publish.yml --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.github/workflows/publish.yml 2024-11-02 17:28:56.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/publish.yml 2024-11-02 16:44:18.000000000 +0000 @@ -170,12 +170,12 @@ flatpak install --user -y flathub org.flatpak.Builder - name: Create RPM build environment - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' + if: github.repository_owner != 'BrycensRanch' run: | rpmdev-setuptree - name: Uninstall Old RPMs - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' + if: github.repository_owner != 'BrycensRanch' run: sudo dnf remove -y rokon rokon-debuginfo rokon-debugsource golang-github-brycensranch-aptabase-devel - name: Build and Install RPMs - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' + if: github.repository_owner != 'BrycensRanch' run: | for spec in ./*.spec; do @@ -195,6 +195,9 @@ echo "Finished building and installing RPMs for $spec" done + - name: Test built RPM + if: github.repository_owner != 'BrycensRanch' + run: rokon --version - name: Uninstall built RPMs - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' + if: github.repository_owner != 'BrycensRanch' run: sudo dnf remove -y rokon rokon-debuginfo rokon-debugsource golang-github-brycensranch-aptabase-devel - name: Lint AppStream Metadata @@ -240,5 +243,5 @@ *.AppImage.zsync - uses: chrisdickinson/setup-yq@latest - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' + if: github.repository_owner != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' with: yq-version: v4.44.3 # renovate: version from https://github.com/mikefarah/yq @@ -263,10 +266,10 @@ commit_author: "github-actions <41898282+github-actions[bot]@users.noreply.github.com>" - name: Extract branch name - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' + if: github.repository_owner != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' shell: bash run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT id: extract_branch - name: Set source branch for Flatpak - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' + if: github.repository_owner != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' run: yq '.modules[0].sources[0].branch = "${{env.BRANCH_NAME}}"' -i flathub/io.github.brycensranch.Rokon-beta.yml env: @@ -274,11 +277,11 @@ - name: Set source URL for Flatpak - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' + if: github.repository_owner != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' run: yq '.modules[0].sources[0].url = "${{env.GITHUB_REPOSITORY_URL}}"' -i flathub/io.github.brycensranch.Rokon-beta.yml env: - GITHUB_REPOSITORY_URL: "${{ github.server_url }}/${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }}.git" + GITHUB_REPOSITORY_URL: "${{ github.server_url }}/${{ github.repository }}.git" - name: ⚙️ Assemble the Flatpak! - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' + if: github.repository_owner != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' working-directory: flathub run: | @@ -289,10 +292,10 @@ flatpak build-bundle export io.github.brycensranch.Rokon-beta.flatpak io.github.brycensranch.Rokon master --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo - name: Test Flatpak - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' + if: github.repository_owner != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' run: | flatpak --branch=beta --user run io.github.brycensranch.Rokon --version - name: 🗃️ Upload Built RPMs 📦 uses: actions/upload-artifact@v4 - if: always() && (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' + if: always() && github.repository_owner != 'BrycensRanch' with: name: rokon-rpm-fedora-x86_64 @@ -303,5 +306,5 @@ - name: 🥙 Upload Built Flatpaks 📦 uses: actions/upload-artifact@v4 - if: always() && (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner || github.repository_owner) != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' + if: always() && github.repository_owner != 'BrycensRanch' || github.event_name == 'pull_request' || github.ref != 'refs/heads/master' with: name: rokon-flatpak-x86_64 @@ -370,5 +373,5 @@ - name: Switch snap git repository if: ${{ github.event_name == 'pull_request' }} - run: yq '.parts.rokon.source = "${{ github.server_url }}/${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name || github.repository }}"' -i snapcraft.yaml + run: yq '.parts.rokon.source = "${{ github.server_url }}/${{ github.repository }}"' -i snapcraft.yaml - name: Force snap to be grade devel if: ${{ github.event_name == 'pull_request' }} diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/PKGBUILD /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/PKGBUILD 2024-11-02 17:29:26.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD 2024-11-02 16:44:46.000000000 +0000 @@ -2,5 +2,5 @@ pkgname=rokon -pkgver=1.0.0+39c6805 +pkgver=1.0.0+712df2e pkgrel=1 epoch=0 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/flathub/README.md /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/flathub/README.md --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/flathub/README.md 2024-11-02 17:28:56.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/flathub/README.md 2024-11-02 16:44:18.000000000 +0000 @@ -21,5 +21,5 @@ # After building with the command provided above... flatpak build-export export builddir -flatpak build-bundle export io.github.brycensranch.Rokon.flatpak io.github.brycensranch.Rokon master --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo +flatpak build-bundle export io.github.brycensranch.Rokon.flatpak io.github.brycensranch.Rokon master ```