44: bump: terra-mock-configs

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
add: proton-core and make proton-vpn dep on it (#9796 ) (#9805 )
2026-05-31 09:01:55 +00:00 · 2026-02-11 19:45:57 -06:00 · 2026-02-11 12:26:17 -06:00 · 2026-02-10 20:05:20 -06:00 · 2026-02-10 14:29:35 -06:00 · 2026-02-10 13:07:55 -06:00
22 changed files with 172 additions and 37 deletions
@@ -2,7 +2,7 @@
  "repoOwner": "terrapkg",
  "repoName": "packages",
  "resetAuthor": true,
-  "targetBranchChoices": ["frawhide", "f43", "f42", "el10"],
+  "targetBranchChoices": ["frawhide", "f44", "f43", "f42", "el10"],
  "branchLabelMapping": {
    "^sync-(.+)$": "$1"
  }
@@ -14,9 +14,12 @@ body:
  - type: input
    id: pkg
    attributes:
-      label: Full Package Name
-      description: If you report multiple packages, only the main package is needed if applicable, or separate them with spaces otherwise. Obtain the full package name using `rpm -qa pkg-name`.
-      placeholder: anda-0.4.14-1.fc43.x86_64
+      label: Full Raw Package Name (e.g. anda-0.4.14-1.fcrawhide.x86_64)
+      description: |
+        If you report multiple packages, only the main package is needed if applicable, or separate them with spaces otherwise. Obtain the full package name using `rpm -qa pkg-name`.
+
+        **The format MUST BE LITERALLY THE SAME as `anda-0.4.14-1.fc43.x86_64`. Do NOT add anything else, not even backticks.**
+      placeholder: anda-0.4.14-1.fc43.x86_64 (MUST be under this format, no backticks)
    validations:
      required: true
  - type: dropdown
@@ -8,13 +8,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - f44
  pull_request:
    branches:
-      - frawhide
+      - f44
  merge_group:
    branches:
-      - frawhide
+      - f44
  workflow_dispatch:
  workflow_call:

@@ -24,7 +24,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f44
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -8,7 +8,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["44"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
@@ -54,6 +54,9 @@ jobs:
      - name: Build terra-release
        run: anda build -D "vendor Terra" -rrpmbuild anda/terra/release/pkg

+      - name: Build terra-appstream-helper
+        run: anda build -D "vendor Terra" -D "__python %{__python3}" -rrpmbuild anda/terra/appstream-helper/pkg
+
      - name: Build Subatomic
        run: anda build -D "vendor Terra" -rrpmbuild anda/tools/buildsys/subatomic/pkg
      - name: Install Subatomic
@@ -25,7 +25,7 @@ jobs:
      build_matrix: ${{ steps.parsing.outputs.build_matrix }}
    runs-on: ubuntu-24.04-arm
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f44
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -35,18 +35,12 @@ on:
        type: boolean
        default: true

-env:
-  RUSTC_WRAPPER: "/usr/bin/sccache"
-  # SCCACHE_NO_DAEMON: "1"
-  # Disable incremental compilation so sccache works better
-  CARGO_INCREMENTAL: "false"
-
 jobs:
  build:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["44"]
      fail-fast: false
    runs-on: ${{ inputs.custom_builder && inputs.custom_builder || (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && format('cirun-x86-64-lg--{0}', github.run_id) || 'ubuntu-22.04' }}
    container:
@@ -75,21 +69,19 @@ jobs:
          dir=$(dirname ${{ matrix.pkg.pkg }})
          dnf5 builddep -y ${dir}/*.spec

-
-      - name: Run sccache-cache
-        uses: mozilla-actions/sccache-action@v0.0.9
-
      - name: Configure sccache
+        if: ${{ !contains(matrix.pkg.labels, 'sccache') }}
        run: |
          set -euo pipefail
+          echo "RUSTC_WRAPPER=/usr/bin/sccache" >> $GITHUB_ENV
+          echo "CARGO_INCREMENTAL=false" >> $GITHUB_ENV
          echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
          if [ "${{ inputs.bust_cache }}" = "true" ]; then
            echo "SCCACHE_BUST_CACHE=true" >> $GITHUB_ENV
          fi

-
      - name: Build with Andaman
-        run: anda build -D "vendor Terra" ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }}
+        run: anda build -D "vendor Terra" -D "__python %{__python3}" ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }}

      - name: Generating artifact name
        id: art
@@ -13,11 +13,12 @@ jobs:
      matrix:
        branch:
          - frawhide
+          - f44
          - f43
          - f42
          - el10
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f44
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -6,6 +6,7 @@ on:
  push:
    branches:
      - frawhide
+      - f44
      - f43
      - f42
      - el10
@@ -17,7 +18,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-24.04-arm
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f44
    steps:
      - uses: actions/checkout@v6
      - name: Push to subatomic
@@ -10,7 +10,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-24.04-arm
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f44
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -10,7 +10,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-24.04-arm
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f44
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -10,7 +10,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-24.04-arm
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f44
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -1,6 +1,6 @@
 Name:			proton-vpn-gtk-app
 Version:		4.14.1
-Release:		1%?dist
+Release:		2%?dist
 Summary:		Official ProtonVPN Linux app
 License:		GPL-3.0-only
 URL:			https://protonvpn.com/download-linux
@@ -27,6 +27,7 @@ Requires:       python3-gobject
 Requires:       python3-dbus
 Requires:       python3-packaging
 Requires:       python3-proton-vpn-api-core
+Requires:       python3-proton-core >= 0.7.0
 Requires:       librsvg2

 Provides:       protonvpn
@@ -13,7 +13,7 @@ Simple terminal UI for git commands.}
 %global godocs          docs README.md VISION.md

 Name:           golang-github-jesseduffield-lazygit
-Release:        1%?dist
+Release:        2%?dist
 Summary:        Simple terminal UI for git commands

 License:        MIT
@@ -23,10 +23,19 @@ Packager:       sadlerm <lerm@chromebooks.lol>

 BuildRequires:  anda-srpm-macros

-Provides:       lazygit = %{version}-%{release}
+Provides:       lazygit = %{evr}

 %description %{common_description}

+
+%package        doc
+Summary:        Documentations for %{name}
+Requires:       %{name} = %{evr}
+BuildArch:      noarch
+
+%description    doc
+%{summary}.
+
 %gopkg

 %prep
@@ -43,5 +52,8 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/

 %files
 %license LICENSE
-%doc docs README.md VISION.md
+%doc README.md
 %{_bindir}/lazygit
+
+%files doc
+%doc docs/ VISION.md CONTRIBUTING.md CODE-OF-CONDUCT.md
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "holyc.spec"
+	}
+}
@@ -0,0 +1,50 @@
+%global ver 0.0.10
+
+Name:          holyc
+Version:       %{ver}~beta
+Release:       3%{?dist}
+Summary:       HolyC compiler and transpiler
+License:       BSD-2-Clause
+URL:           https://holyc-lang.com
+Source0:       https://github.com/Jamesbarford/holyc-lang/archive/refs/tags/beta-v%{ver}.tar.gz
+BuildRequires: cmake
+BuildRequires: cmake-rpm-macros
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: sqlite-devel
+Packager:      Gilver E. <roachy@fyralabs.com>
+
+%description
+HolyC is a fun recreational programming language designed by Terry A. Davis.
+Originally implemented in TempleOS as a general purpose programming language and scripting language for all manner of tasks.
+
+%prep
+# Currently needed to fetch the commit hash for hcc --version
+%git_clone https://github.com/Jamesbarford/holyc-lang.git beta-v%{ver}
+%setup -T -D -n holyc-lang/src
+# Make packaged versions of HolyC report the correct Git hash
+sed -i 's|git rev-parse main|git rev-parse HEAD|g' CMakeLists.txt
+# Make the binary correctly report its installed location as /usr/bin instead of /usr
+sed -i 's|binary: %%s/hcc|binary: %%s/bin/hcc|g' cli.c
+
+%build
+%cmake \
+  -DCMAKE_BUILD_TYPE="Release" \
+  -DHCC_LINK_SQLITE3="1"
+%cmake_build
+
+%install
+%cmake_install
+
+%check
+%{buildroot}%{_bindir}/hcc --version
+
+%files
+%license ../COPYING
+%doc ../README.md
+%{_bindir}/hcc
+%{_includedir}/tos.HH
+
+%changelog
+* Tue Feb 10 2026 Gilver E. <roachy@fyralabs.com> - 0.0.10~beta-1
+- Initial package
@@ -0,0 +1,7 @@
+let v = gh("Jamesbarford/holyc-lang");
+v.crop(6);
+rpm.global("ver", v);
+
+if rpm.changed() {
+  rpm.release();
+}
@@ -0,0 +1,9 @@
+project pkg {
+    arches = ["x86_64"]
+  rpm {
+    spec = "proton-core.spec"
+  }
+  labels {
+    subrepo = "extras"
+  }
+}
@@ -0,0 +1,46 @@
+%define unmangled_name proton-core
+%define github_repo_name python-proton-core
+%global _desc The proton-core component contains core logic used by the other Proton components.
+
+Name:       python-proton-core
+Version:    0.7.0
+Release:    1%?dist
+Summary:    %{unmangled_name} library
+License:    GPL-3.0-or-later
+URL:        https://github.com/ProtonVPN/%{github_repo_name}
+Source:     %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-pip
+BuildRequires:  python3-setuptools
+BuildArch:      noarch
+
+Packager:       Owen Zimmerman <owen@fyralabs.com>
+
+%description
+%_desc
+
+%package -n python3-%{unmangled_name}
+Summary: %{summary}
+%{?python_provide:%python_provide python3-%{unmangled_name}}
+
+%description -n python3-%{unmangled_name}
+%_desc
+
+%prep
+%autosetup
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%pyproject_save_files proton
+
+%files -n python3-%{unmangled_name} -f %{pyproject_files}
+%doc README.md
+%license LICENSE
+
+%changelog
+* Tue Feb 10 2026 Owen Zimmerman <owen@fyralabs.com>
+- Initial commit
@@ -0,0 +1 @@
+rpm.version(gh_tag("ProtonVPN/python-proton-core"));
@@ -2,4 +2,7 @@
    rpm {
 	    spec = "proton-vpn-local-agent.spec"
    }
+    labels {
+      sccache = 0
+    }
  }
@@ -1,11 +1,12 @@
 %define debug_package %{nil}
+%define __python /usr/bin/python3

 %global pypi_name proton-vpn-local-agent
 %global _desc Proton VPN local agent written in Rust.

 Name:			python-%{pypi_name}
 Version:		1.6.0
-Release:		2%?dist
+Release:		3%?dist
 Summary:		Proton VPN local agent written in Rust
 License:		GPL-3.0-only
 URL:			https://github.com/ProtonVPN/local-agent-rs
@@ -15,7 +16,7 @@ BuildRequires:  python3-devel
 BuildRequires:  cargo-rpm-macros

 # Really cursed but there is no pyproject.toml or setup.py in this package to auto-provide this, and proton-vpn needs this
-Provides:       python3.14dist(proton-vpn-local-agent)
+%dnl Provides:       python3.14dist(proton-vpn-local-agent)

 Packager:	    Owen Zimmerman <owen@fyralabs.com>

@@ -43,12 +44,12 @@ popd

 %install
 pushd %{name}
-install -Dm0644 target/release/libpython_proton_vpn_local_agent.so %{buildroot}%{_libdir}/proton/local_agent.so
+install -Dm0644 target/release/libpython_proton_vpn_local_agent.so %{buildroot}%{python_sitearch}/proton/vpn/local_agent.so
 popd

 %files -n python3-%{pypi_name}
 %doc README.md CODEOWNERS
-%{_libdir}/proton/local_agent.so
+%{python_sitearch}/proton/vpn/local_agent.so

 %changelog
 * Sun Jan 18 2026 Owen Zimmerman <owen@fyralabs.com>
@@ -1,5 +1,5 @@
 Name:           terra-mock-configs
-Version:        2.1.2
+Version:        2.2.2
 Release:        1%?dist
 Epoch:          1
 Summary:        Mock configs for Terra repos
Author	SHA1	Message	Date
Owen Zimmerman	6b1430a9e3	44: bump: terra-mock-configs Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>	2026-02-11 19:45:57 -06:00
Raboneko	95090ce836	add: proton-core and make proton-vpn dep on it (#9796 ) (#9805 )	2026-02-11 12:26:17 -06:00
Raboneko	4954e04083	fix(holyc): Account for C silliness (#9795 ) (#9800 )	2026-02-10 20:05:20 -06:00
Raboneko	287b86acd9	fix(holyc): hcc --version output and update script (#9790 ) (#9794 ) * fix(holyc): hcc --version output and update script * cleanup: Remove %check (cherry picked from commit `4564f51413`) Co-authored-by: Gilver <roachy@fyralabs.com>	2026-02-10 14:29:35 -06:00
Raboneko	03a97f3649	feat(ci): Explicitly set default Python to python3 (#9786 ) (#9789 )	2026-02-10 13:07:55 -06:00
Raboneko	ab0ed286a7	add: HolyC (#9780 ) (#9784 ) * add: HolyC * chore: Bump changelog date --------- (cherry picked from commit `d9a801eb96`) Signed-off-by: Gilver <roachy@fyralabs.com> Co-authored-by: Gilver <roachy@fyralabs.com>	2026-02-10 11:49:39 -06:00
Raboneko	f415e7b0a7	fix: proton-vpn-local-agent (#9768 ) (#9779 )	2026-02-10 11:17:39 -06:00
Gilver	a7498795c1	feat: Toggleable sccache (#9773 ) (#9774 )	2026-02-10 11:06:50 -06:00
Raboneko	2afce95fee	docs: clarify pkg field for bug template (#9767 ) (#9772 )	2026-02-10 10:32:45 -06:00
Raboneko	e809307466	chore (lazygit): add doc subpackage, some cleanup (#9757 ) (#9766 )	2026-02-09 23:48:41 -06:00
Raboneko	175f1e5fab	bump: terra-mock-configs (#9758 ) (#9762 )	2026-02-09 22:35:49 -06:00
Raboneko	9a100d1646	fix: remove second lazygit (#9752 ) (#9756 ) (cherry picked from commit `14299672ed`) Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>	2026-02-09 21:30:26 -06:00
Raboneko	f9dc058ebd	add: lazygit (#9747 ) (#9751 ) * add: lazygit * package lazygit manpage * use upstream description * unify %install * unify name --------- (cherry picked from commit `14c769128a`) Signed-off-by: Owen-sz <owen@fyralabs.com> Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>	2026-02-09 20:04:42 -06:00
Raboneko	13ee8ae890	fix: add appstream-helper to bootstrap (#9738 ) (#9746 ) (cherry picked from commit `f7b367dd21`) Co-authored-by: lea <lleyton@fyralabs.com>	2026-02-09 17:05:03 -08:00
Raboneko	785b863703	chore: add f44 as a valid backport target (#9737 ) (#9742 ) (cherry picked from commit `e15ea833d9`) Co-authored-by: lea <lleyton@fyralabs.com>	2026-02-09 16:59:29 -08:00
Owen Zimmerman	ac1ba4d9d2	feat: f44 CI (#9736 ) Signed-off-by: Owen-sz <owen@fyralabs.com>	2026-02-09 16:35:01 -08:00
				`@@ -0,0 +1 @@`
				`rpm.version(gh_tag("ProtonVPN/python-proton-core"));`