From f1acc96a72f51b769238de1195b7e9e91b6c1563 Mon Sep 17 00:00:00 2001 From: aikawayataro Date: Fri, 10 Jan 2025 01:29:19 +0000 Subject: [PATCH] ci: remove Buildkite, add missing dependencies, README edits (#885) * build: add libicu dependency for deb package * ci: remove obsolete Buildkite publish workflow * build: add xdg-utils dependency * readme: update Linux notes Remove Buildkite repo instructions and fix some typos. --- .github/workflows/publish-packages.yml | 39 -------------------------- .github/workflows/release.yml | 6 ---- README.md | 33 ++-------------------- SourceGit.sln | 1 - build/resources/deb/DEBIAN/control | 2 +- build/resources/rpm/SPECS/build.spec | 1 + 6 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 .github/workflows/publish-packages.yml diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml deleted file mode 100644 index 9e465fe7..00000000 --- a/.github/workflows/publish-packages.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Publish to Buildkite -on: - workflow_call: - secrets: - BUILDKITE_TOKEN: - required: true -jobs: - publish: - name: Publish to Buildkite - runs-on: ubuntu-latest - strategy: - matrix: - runtime: [linux-x64, linux-arm64] - steps: - - name: Download package artifacts - uses: actions/download-artifact@v4 - with: - name: package.${{ matrix.runtime }} - path: packages - - - name: Publish DEB package - env: - BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }} - run: | - FILE=$(echo packages/*.deb) - curl -X POST https://api.buildkite.com/v2/packages/organizations/sourcegit/registries/sourcegit-deb/packages \ - -H "Authorization: Bearer $BUILDKITE_TOKEN" \ - -F "file=@$FILE" \ - --fail - - - name: Publish RPM package - env: - BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }} - run: | - FILE=$(echo packages/*.rpm) - curl -X POST https://api.buildkite.com/v2/packages/organizations/sourcegit/registries/sourcegit-rpm/packages \ - -H "Authorization: Bearer $BUILDKITE_TOKEN" \ - -F "file=@$FILE" \ - --fail diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d15aaeda..e61e608b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,12 +24,6 @@ jobs: uses: ./.github/workflows/package.yml with: version: ${{ needs.version.outputs.version }} - publish-packages: - needs: [package, version] - name: Publish Packages - uses: ./.github/workflows/publish-packages.yml - secrets: - BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }} release: needs: [package, version] name: Release diff --git a/README.md b/README.md index 14a478b7..b19e8975 100644 --- a/README.md +++ b/README.md @@ -102,37 +102,10 @@ For **macOS** users: For **Linux** users: -* For Debian/Ubuntu based distributions, you can add the `sourcegit` repository by following: - You may need to install curl and/or gpg first, if you're on a very minimal host: - ```shell - apt update && apt install curl gpg -y - ``` - Install the registry signing key: - ```shell - curl -fsSL "https://packages.buildkite.com/sourcegit/sourcegit-deb/gpgkey" | gpg --dearmor -o /etc/apt/keyrings/sourcegit_sourcegit-deb-archive-keyring.gpg - ``` - Configure the source: - ```shell - echo -e "deb [signed-by=/etc/apt/keyrings/sourcegit_sourcegit-deb-archive-keyring.gpg] https://packages.buildkite.com/sourcegit/sourcegit-deb/any/ any main\ndeb-src [signed-by=/etc/apt/keyrings/sourcegit_sourcegit-deb-archive-keyring.gpg] https://packages.buildkite.com/sourcegit/sourcegit-deb/any/ any main" > /etc/apt/sources.list.d/buildkite-sourcegit-sourcegit-deb.list - ``` - Update your local repository and install the package: - ```shell - apt update && apt install sourcegit - ``` -* For RHEL/Fedora based distributions, you can add the `sourcegit` repository by following: - Configure the source: - ```shell - sudo sh -c 'echo -e "[sourcegit-rpm]\nname=sourcegit-rpm\nbaseurl=https://packages.buildkite.com/sourcegit/sourcegit-rpm/rpm_any/rpm_any/\$basearch\nenabled=1\nrepo_gpgcheck=1\ngpgcheck=0\ngpgkey=https://packages.buildkite.com/sourcegit/sourcegit-rpm/gpgkey\npriority=1"' > /etc/yum.repos.d/sourcegit-rpm.repo - ``` - Install the package with this command: - ```shell - sudo dnf install -y sourcegit - ``` -* `Appimage` files can be found on [AppimageHub](https://appimage.github.io/SourceGit/) -* `xdg-open` must be installed to support open native file manager. -* Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your linux. +* `AppImage` files can be found on [AppImage hub](https://appimage.github.io/SourceGit/), `xdg-open` (`xdg-utils`) must be installed to support open native file manager. +* Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your Linux. * Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI. -* If you can NOT type accented characters, such as `ê`, `ó`, try to set the environment variable `AVALONIA_IM_MODULE` to `none`. +* If you can NOT type accented characters, such as `ê`, `ó`, try to set the environment variable `AVALONIA_IM_MODULE` to `none`. ## OpenAI diff --git a/SourceGit.sln b/SourceGit.sln index 88730204..cf761abd 100644 --- a/SourceGit.sln +++ b/SourceGit.sln @@ -18,7 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{ .github\workflows\package.yml = .github\workflows\package.yml .github\workflows\release.yml = .github\workflows\release.yml .github\workflows\localization-check.yml = .github\workflows\localization-check.yml - .github\workflows\publish-packages.yml = .github\workflows\publish-packages.yml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49A7C2D6-558C-4FAA-8F5D-EEE81497AED7}" diff --git a/build/resources/deb/DEBIAN/control b/build/resources/deb/DEBIAN/control index 7cfed330..993b5fac 100755 --- a/build/resources/deb/DEBIAN/control +++ b/build/resources/deb/DEBIAN/control @@ -1,7 +1,7 @@ Package: sourcegit Version: 8.23 Priority: optional -Depends: libx11-6, libice6, libsm6 +Depends: libx11-6, libice6, libsm6, libicu76 | libicu72 | libicu67 | libicu63, xdg-utils Architecture: amd64 Maintainer: longshuang@msn.cn Description: Open-source & Free Git GUI Client diff --git a/build/resources/rpm/SPECS/build.spec b/build/resources/rpm/SPECS/build.spec index bc10ca48..2a684837 100644 --- a/build/resources/rpm/SPECS/build.spec +++ b/build/resources/rpm/SPECS/build.spec @@ -8,6 +8,7 @@ Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version. Requires: libX11.so.6()(%{__isa_bits}bit) Requires: libSM.so.6()(%{__isa_bits}bit) Requires: libicu +Requires: xdg-utils %define _build_id_links none