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-04 16:20:20.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.github/workflows/publish.yml 2024-11-02 17:28:56.000000000 +0000 @@ -33,4 +33,5 @@ with: push: true + continue-on-error: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} @@ -162,7 +163,7 @@ - name: Install Required System Packages run: | - sudo dnf up -y --allowerasing + sudo dnf update -y sudo dnf copr enable @go-sig/golang-rawhide -y - sudo dnf install -y git golang gtk4-devel gobject-introspection-devel go-vendor-tools @development-tools clang @development-libs @c-development flatpak flatpak-builder fedora-packager fedora-review @rpm-development-tools go-rpm-macros yq + sudo dnf install -y git golang gtk4-devel gobject-introspection-devel go-vendor-tools @development-tools clang @development-libs @c-development flatpak flatpak-builder fedora-packager fedora-review @rpm-development-tools go-rpm-macros flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo @@ -238,4 +239,8 @@ *.AppImage *.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' + with: + yq-version: v4.44.3 # renovate: version from https://github.com/mikefarah/yq - name: 🔷 Update Flatpak Data run: | @@ -329,8 +334,12 @@ sudo apt update sudo add-apt-repository ppa:longsleep/golang-backports -y - sudo apt install -y libgtk-4-dev libgirepository1.0-dev build-essential devscripts debhelper dh-make golang dput yq + sudo apt install -y libgtk-4-dev libgirepository1.0-dev build-essential devscripts debhelper dh-make golang dput - name: Install Snapcraft if: ${{ github.event_name == 'pull_request' }} uses: samuelmeuli/action-snapcraft@v2 + - uses: chrisdickinson/setup-yq@latest + if: ${{ github.event_name == 'pull_request' }} + with: + yq-version: v4.44.3 # renovate: version from https://github.com/mikefarah/yq - name: Extract branch name shell: bash @@ -369,19 +378,14 @@ if: ${{ github.event_name == 'pull_request' }} id: snapcraft_build - - name: Test Installing Snap - if: ${{ github.event_name == 'pull_request' }} - run: sudo snap install ${{ steps.snapcraft_build.outputs.snap }} --dangerous - - name: Test Installed Snap' - if: ${{ github.event_name == 'pull_request' }} - run: rokon --version - - uses: snapcore/action-publish@v1 - if: ${{ github.event_name == 'pull_request' }} - # When external PRs try to run this, it will fail because they don't have Snapcraft Login Credentials - continue-on-error: true - env: - SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_LOGIN_CREDENTIALS }} - with: - snap: ${{ steps.snapcraft_build.outputs.snap }} - release: edge/${{ steps.sanitized_branch.sanitized_branch }} + # - name: Test Installing Snap + # run: sudo snap install ${{ steps.snapcraft_build.outputs.snap }} --dangerous + # - name: Test Installed Snap + # run: rokon --version + # - uses: snapcore/action-publish@v1 + # env: + # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} + # with: + # snap: ${{ steps.snapcraft_build.outputs.snap }} + # release: edge/${{ steps.sanitized_branch.sanitized_branch }} - name: 🗃️ Upload Snap uses: actions/upload-artifact@v4 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.gitignore /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.gitignore --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/.gitignore 2024-11-04 16:20:20.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/.gitignore 2024-11-01 21:06:48.000000000 +0000 @@ -36,8 +36,4 @@ ./shellc* -remote.go -changelog_reader.go -http_client.go - *.log *.zip 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-04 16:20:46.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/PKGBUILD 2024-11-04 15:26:56.000000000 +0000 @@ -2,5 +2,5 @@ pkgname=rokon -pkgver=1.0.0+e0af8f5 +pkgver=1.0.0+1b25a68 pkgrel=1 epoch=0 diff -U2 -r /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/main.go /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/main.go --- /var/lib/copr-rpmbuild/results/rokon/upstream-unpacked/Source0/main.go 2024-11-04 16:20:20.000000000 +0000 +++ /var/lib/copr-rpmbuild/results/rokon/srpm-unpacked/rokon-vendored-source.zip-extract/main.go 2024-11-04 15:26:30.000000000 +0000 @@ -110,6 +110,4 @@ commit = "unknown" branch = "unknown" - logFilePath = filepath.Join(xdg.DataHome, "rokon", "latest.log") - tempDir = filepath.Join(xdg.CacheHome, "rokon") ) @@ -120,9 +118,9 @@ fmt.Println("Running on Windows or macOS.") // Use GLib to set the GTK_CSD environment variable for Client-Side Decorations - glib.Setenv("GTK_CSD", "0", true) - os.Setenv("GTK_CSD", "0") + glib.Setenv("GTK_CSD", "1", true) + os.Setenv("GTK_CSD", "1") default: } - app := gtk.NewApplication("io.github.brycensranch.Rokon", gio.ApplicationFlagsNone) + app := gtk.NewApplication("io.github.brycensranch.Rokon", gio.ApplicationDefaultFlags) aptabaseClient = aptabase.NewClient("A-US-0332858461", version, uint64(133), true, "") if version != "" { @@ -474,4 +472,5 @@ func fetchImageAsPaintable(url string) (string, error) { + tempDir := filepath.Join(xdg.CacheHome, "rokon") client := resty.New() resp, err := client.SetOutputDirectory(tempDir).EnableTrace().R().