Implement beta publishing on development branch by VikramGoyal23 · Pull Request #85 · git-mastery/app

VikramGoyal23 · 2026-03-23T19:13:36Z

Should be merged after the actions PR and after gitmastery-beta is registered on AUR and Winget.

RFC: https://docs.google.com/document/d/17ZhVua_eH_mWQIDc90ojq6EkiolRXQa5asBBvZhgfAU/edit?tab=t.0

jovnc · 2026-04-11T09:56:24Z

@VikramGoyal23 Can we check on status of this? Hopefully we can get this merged soon before the semester ends.

.github/workflows/publish-beta.yml

+        uses: actions/checkout@v6
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v7


.github/workflows/publish-beta.yml

+          uv run pyinstaller --onefile main.py --name $FILENAME
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2


.github/workflows/publish-beta.yml

+          dpkg-buildpackage -us -uc -a ${ARCHITECTURE}
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2


.github/workflows/publish-beta.yml

+          sudo chown -R $(id -u):$(id -g) .
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2


.github/workflows/publish-beta.yml

+        uses: actions/checkout@v6
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v7


.github/workflows/publish-beta.yml

+          uv run pyinstaller --onefile --name gitmastery-beta main.py
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2


.github/workflows/publish-beta.yml

+
+    steps:
+      - name: Submit to WinGet
+        uses: vedantmgoyal9/winget-releaser@v2


.github/workflows/publish-beta.yml

+        uses: actions/checkout@v6
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v7


.github/workflows/publish-beta.yml

+          echo "sha256=$SHA256" >> $GITHUB_OUTPUT
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2


VikramGoyal23 · 2026-04-13T05:44:51Z

Can be merged immediately after the actions PR, doesn't need to wait for registration on AUR or Winget.

Copilot

Pull request overview

Implements a beta release/publishing pipeline (tagged vX.Y.Z-beta.N) alongside the existing stable publishing flow, and updates version handling to recognize beta prerelease versions.

Changes:

Extend Version to include an optional beta prerelease component and update parsing/formatting logic.
Add GitHub Actions workflows to bump beta tags and publish beta artifacts/packages across platforms.
Minor formatting adjustment in the existing publish workflow.

Reviewed changes

Copilot reviewed 4 out of 5 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
`app/utils/version.py`	Adds prerelease support and beta-aware parsing/printing for version strings.
`app/utils/git.py`	Updates `MIN_GIT_VERSION` construction to match the new `Version` signature.
`.github/workflows/publish.yml`	Minor formatting/indentation adjustment.
`.github/workflows/publish-beta.yml`	New workflow to build/release beta binaries and publish to Debian APT, AUR, Homebrew (and placeholder Winget).
`.github/workflows/bump-version-beta.yml`	New workflow that triggers the reusable beta tag bump workflow.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-13T05:53:54Z

app/utils/version.py

    major: int
    minor: int
    patch: int
+    prerelease: Optional[int]


prerelease is now a required dataclass field, which forces all direct Version(...) call sites to pass an explicit None. Consider giving this field a default of None (and/or using int | None) to keep construction backwards-compatible and reduce call-site churn.

Suggested change

prerelease: Optional[int]

prerelease: Optional[int] = None

Copilot · 2026-04-13T05:53:55Z

app/utils/version.py

        only_version = version[1:]
+        if "beta" in only_version:
+            [major, minor, patch, prerelease] = [part[0] for part in only_version.split(".")]
+            return Version(int(major), int(minor), int(patch), int(prerelease))


Beta parsing here is incorrect: part[0] takes only the first character of each component, so multi-digit versions like v10.2.3-beta.12 will be mis-parsed (major=1, prerelease=1). Also only_version.split('.') yields a patch component like "3-beta", which should be split on -beta. rather than truncated.

Copilot · 2026-04-13T05:53:55Z

app/utils/version.py

        """Parse a plain version string (e.g., '1.2.3')."""
        parts = version.split(".")
-        if len(parts) != 3:
+        if ("beta" in version and len(parts) != 4) or len(parts) != 3:


The validation condition is wrong for beta versions: when version contains beta and parts has 4 elements, len(parts) != 3 still makes this branch raise every time. The condition should distinguish between beta and non-beta formats instead of combining them with or len(parts) != 3.

Suggested change

if ("beta" in version and len(parts) != 4) or len(parts) != 3:

if ("beta" in version and len(parts) != 4) or ("beta" not in version and len(parts) != 3):

Copilot · 2026-04-13T05:53:55Z

app/utils/version.py

+            if len(parts) == 4:
+                major, minor, patch, prerelease = (int(part[0]) for part in parts)
+            else:
+                major, minor, patch = (int(part) for part in parts)
+                prerelease = None


When parsing 4-part beta versions, int(part[0]) will truncate multi-digit components and doesn’t actually remove the -beta suffix from the patch component. Use a proper split/regex to extract major.minor.patch and the numeric prerelease (or reject beta strings in parse() if that’s not supported).

Copilot · 2026-04-13T05:53:55Z

app/utils/version.py

+        if self.prerelease and other.prerelease:
+            return (other.major, other.minor, other.prerelease) > (self.major, self.minor, self.prerelease)


is_behind uses truthiness checks for prerelease and compares only (major, minor, prerelease) when both are prereleases. This will treat prerelease=0 as absent, and it can mis-order versions if the patch differs between beta versions (e.g., 1.2.4-beta.1 vs 1.2.3-beta.9). Prefer explicit is not None checks and include patch in the comparison when comparing two prerelease versions.

Suggested change

if self.prerelease and other.prerelease:

return (other.major, other.minor, other.prerelease) > (self.major, self.minor, self.prerelease)

if self.prerelease is not None and other.prerelease is not None:

return (other.major, other.minor, other.patch, other.prerelease) > (

self.major,

self.minor,

self.patch,

self.prerelease,

)

prerelease will never be 0 but the part about patch is valid

Copilot · 2026-04-13T05:53:55Z

app/utils/version.py

        return (other.major, other.minor) > (self.major, self.minor)

    def __repr__(self) -> str:
+        if self.prerelease:


__repr__ uses if self.prerelease: which will omit the -beta.N suffix when prerelease is 0. Use an explicit is not None check for optional prerelease values.

Suggested change

if self.prerelease:

if self.prerelease is not None:

prerelease will never be 0 but this is still good practice

Copilot · 2026-04-13T05:53:56Z

.github/workflows/publish-beta.yml

+            install -D -m 0755 \"\$srcdir/$BINARY_NAME\" \"\$pkgdir/usr/bin/gitmastery\"
+            chmod 755 \"\$pkgdir/usr/bin/gitmastery\"


This AUR package installs the binary as /usr/bin/gitmastery, which will conflict with the stable gitmastery package and doesn’t match the gitmastery-beta-bin naming used elsewhere (Debian/Homebrew use gitmastery-beta). Install it as gitmastery-beta to avoid overwriting the stable CLI.

Suggested change

install -D -m 0755 \"\$srcdir/$BINARY_NAME\" \"\$pkgdir/usr/bin/gitmastery\"

chmod 755 \"\$pkgdir/usr/bin/gitmastery\"

install -D -m 0755 \"\$srcdir/$BINARY_NAME\" \"\$pkgdir/usr/bin/gitmastery-beta\"

chmod 755 \"\$pkgdir/usr/bin/gitmastery-beta\"

Copilot · 2026-04-13T05:53:56Z

.github/workflows/publish-beta.yml

+    permissions: write-all
+    uses: git-mastery/gitmastery-beta-apt-repo/.github/workflows/debian-apt-repo-beta.yml@main
+    with:
+      version: ${{ needs.prepare.outputs.ref_name }}
+    secrets: inherit


permissions: write-all is overly broad for this job and increases blast radius if a workflow token is misused. Prefer least-privilege permissions (e.g., only the scopes required by the called reusable workflow) and keep it consistent with the top-level permissions block where possible.

jiaxinnns

Some comments. All the suggestions from Copilot are worth noting too, especially the parsing bugs in version.py

jiaxinnns · 2026-04-13T08:27:16Z

.github/workflows/publish-beta.yml

+        run: |
+          cd aur-pkg
+
+          BINARY_NAME=gitmastery-beta-${VERSION}-linux-${ARCHITECTURE}


BINARY_NAME=gitmastery-beta-${VERSION}-linux-${ARCHITECTURE} uses the pattern linux in the binary name, but the arch-build job produces artifacts named gitmastery-beta-${VERSION}-arch-amd64 (using arch instead of linux). Is this intentional?

jiaxinnns · 2026-04-13T08:33:23Z

.github/workflows/publish-beta.yml

+          cat <<EOF > gitmastery-beta.rb
+          class GitmasteryBeta < Formula
+            desc "CLI tool for Git-Mastery"
+            homepage "https://github.com/git-mastery/cli"


I assume this was the old name for the app repo, should we standardise to use the new URL https://github.com/git-mastery/app (like in arch-publish) for consistency?

This is a good catch. While the cli link does redirect to our app repository, it is outdated. For consistency, however, I would then have to update the workflow for stable releases as well (publish.yml). As such, I think it is best to create a separate "chore" PR for this later.

jiaxinnns · 2026-04-13T08:39:33Z

.github/workflows/publish-beta.yml

+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: dist/gitmastery-beta.exe


For Linux and macOS, your binaries include the version and architecture in the filename (e.g. gitmastery-beta-1.0.0-linux-amd64). However, in the windows job, you compile and upload it simply as gitmastery-beta.exe. Is there a specific reason for this?

This is to keep it consistent with the stable GitHub releases for Windows.

jiaxinnns · 2026-04-13T08:53:29Z

.github/workflows/publish-beta.yml

+
+          git add .
+          git commit -m "Update package"
+          git push --force


This is a destructive action if another maintainer pushes between steps. We can consider a regular push with rebase/merge strategy

jiaxinnns · 2026-04-13T08:55:08Z

.github/workflows/publish-beta.yml

+          )
+          changelog=\"gitmastery.changelog\"
+          source=(\"${BINARY_NAME}::${RELEASE_AMD64_URL}\")
+          sha256sums=('SKIP')


Could this potentially be a security issue?

jiaxinnns · 2026-04-13T08:56:59Z

.github/workflows/publish-beta.yml

+
+      - name: Generate Debian packaging files
+        working-directory: gitmastery-beta-${{ env.VERSION }}-${{ env.ARCHITECTURE }}
+        # TODO: Update to something agnostic


Should be addressed before merging

Looking at the revision history for publish.yml (where most of this workflow is copied from), this comment appears to be an accidental leftover from when Woo Jiahao used to define the EMAIL and NAME variables inside the run block. He later shifted their definitions to be inside env (Revision for reference). The "agnostic" comment refers to the name and email, not the working-directory. Since Jiahao is the long-time maintainer of the repository, I think it's best to leave his name and email as the maintainer details.

Copilot

Pull request overview

Copilot reviewed 4 out of 5 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-13T13:16:29Z

app/utils/version.py

        """Parse a plain version string (e.g., '1.2.3')."""
        parts = version.split(".")
-        if len(parts) != 3:
+        if ("beta" in version and len(parts) != 4) or len(parts) != 3:


The validation condition is logically incorrect: (... and len(parts) != 4) or len(parts) != 3 will always raise for beta versions because len(parts) is 4, so len(parts) != 3 is true. Rewrite this as two distinct cases (beta => 4 parts, non-beta => 3 parts).

Suggested change

if ("beta" in version and len(parts) != 4) or len(parts) != 3:

if "beta" in version:

if len(parts) != 4:

raise ValueError(

f"Invalid version string (expected 'MAJOR.MINOR.PATCH[-beta.PRERELEASE]'): {version!r}"

)

elif len(parts) != 3:

Copilot · 2026-04-13T13:16:29Z

app/utils/version.py

        """Returns if the current version is behind the other version based on major and minor versions."""
+        if self.prerelease and other.prerelease:
+            return (other.major, other.minor, other.prerelease) > (self.major, self.minor, self.prerelease)
        return (other.major, other.minor) > (self.major, self.minor)


is_behind compares prerelease versions using (major, minor, prerelease) only, which can mis-order beta versions when patch differs (e.g., 1.2.4-beta.1 vs 1.2.3-beta.9). Include patch in the comparison (and ideally use is not None checks for the optional prerelease field).

Suggested change

"""Returns if the current version is behind the other version based on major and minor versions."""

if self.prerelease and other.prerelease:

return (other.major, other.minor, other.prerelease) > (self.major, self.minor, self.prerelease)

return (other.major, other.minor) > (self.major, self.minor)

"""Returns if the current version is behind the other version based on major, minor, patch, and prerelease versions."""

if self.prerelease is not None and other.prerelease is not None:

return (other.major, other.minor, other.patch, other.prerelease) > (

self.major,

self.minor,

self.patch,

self.prerelease,

)

return (other.major, other.minor, other.patch) > (

self.major,

self.minor,

self.patch,

)

Copilot · 2026-04-13T13:16:30Z

app/utils/version.py

        return (other.major, other.minor) > (self.major, self.minor)

    def __repr__(self) -> str:
+        if self.prerelease:


__repr__ uses a truthiness check (if self.prerelease:). Since prerelease is an Optional[int], this will treat 0 the same as None and omit the -beta.N suffix. Prefer an explicit is not None check for optional fields.

Suggested change

if self.prerelease:

if self.prerelease is not None:

jovnc · 2026-04-13T13:18:14Z

.github/workflows/publish.yml

          brew install gitmastery
          file "$(brew --prefix)/bin/gitmastery"
-          gitmastery --help
+          gitmastery --help


Can we revert to to keep the diff cleaner? Would also be good to have the newline at the end as convention as well

My bad, that slipped through while reverting the file.

jovnc · 2026-04-13T13:20:15Z

app/utils/git.py

 from app.utils.version import Version

-MIN_GIT_VERSION = Version(2, 28, 0)
+MIN_GIT_VERSION = Version(2, 28, 0, None)


Suggested change

MIN_GIT_VERSION = Version(2, 28, 0, None)

MIN_GIT_VERSION = Version(2, 28, 0)

Prerelease shouldn't be a compulsory field, this should be backwards compatible with existing code. Set default = None if not specified

jovnc · 2026-04-13T13:20:51Z

.github/workflows/bump-version-beta.yml

As mentioned in the comment in the actions repository, the logic for it should live here

jovnc · 2026-04-13T13:25:53Z

.github/workflows/publish-beta.yml

+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  winget-publish:


Is there a plan to publish on winget too?

jovnc · 2026-04-13T13:27:31Z

Other than that, I think you can feel free to push to main one these are fixed, then you can debug while publishing to beta as well to test it out.

…ate file

VikramGoyal23 temporarily deployed to e2e-test March 23, 2026 19:13 — with GitHub Actions Inactive

VikramGoyal23 requested a review from jiaxinnns March 23, 2026 19:13

VikramGoyal23 marked this pull request as draft March 23, 2026 19:17

VikramGoyal23 force-pushed the beta-publishing branch from 1707c2d to a7c9451 Compare March 30, 2026 05:50

VikramGoyal23 requested a deployment to e2e-test March 30, 2026 05:50 — with GitHub Actions Waiting

VikramGoyal23 force-pushed the beta-publishing branch from a7c9451 to 275576b Compare April 1, 2026 02:35

VikramGoyal23 requested a deployment to e2e-test April 1, 2026 02:36 — with GitHub Actions Waiting

VikramGoyal23 requested a deployment to e2e-test April 1, 2026 06:27 — with GitHub Actions Waiting

VikramGoyal23 force-pushed the beta-publishing branch from 8c7e033 to bb5aba5 Compare April 4, 2026 11:09

VikramGoyal23 requested a deployment to e2e-test April 4, 2026 11:09 — with GitHub Actions Waiting

VikramGoyal23 requested a deployment to e2e-test April 8, 2026 05:34 — with GitHub Actions Waiting

VikramGoyal23 requested a deployment to e2e-test April 10, 2026 07:54 — with GitHub Actions Waiting

VikramGoyal23 force-pushed the beta-publishing branch from 70ffcf3 to 03d3902 Compare April 13, 2026 05:42

VikramGoyal23 requested a deployment to e2e-test April 13, 2026 05:42 — with GitHub Actions Waiting

github-advanced-security AI found potential problems Apr 13, 2026

View reviewed changes

VikramGoyal23 marked this pull request as ready for review April 13, 2026 05:48

VikramGoyal23 requested review from SAN-MUYUN, desmondwong1215 and jovnc as code owners April 13, 2026 05:48

jovnc requested a review from Copilot April 13, 2026 05:49

Copilot started reviewing on behalf of jovnc April 13, 2026 05:49 View session

Copilot AI reviewed Apr 13, 2026

View reviewed changes

jiaxinnns requested changes Apr 13, 2026

View reviewed changes

jovnc requested a review from Copilot April 13, 2026 13:11

Copilot started reviewing on behalf of jovnc April 13, 2026 13:12 View session

Copilot AI reviewed Apr 13, 2026

View reviewed changes

jovnc reviewed Apr 13, 2026

View reviewed changes

VikramGoyal23 added 5 commits April 15, 2026 12:02

Implement beta publishing on development branch

9ab712d

Add semver handling

3ca4e3c

Prevent publishing to winget for beta versions (temporary)

7343821

Add handling for beta iterations to Version class

734eb9d

Refactor to work on manual trigger and do housekeeping by using separ…

ca1026d

…ate file

VikramGoyal23 force-pushed the beta-publishing branch from 03d3902 to ca1026d Compare April 15, 2026 04:03

VikramGoyal23 requested a deployment to e2e-test April 15, 2026 04:03 — with GitHub Actions Waiting

	if ("beta" in version and len(parts) != 4) or len(parts) != 3:
	if ("beta" in version and len(parts) != 4) or ("beta" not in version and len(parts) != 3):

		if self.prerelease and other.prerelease:
		return (other.major, other.minor, other.prerelease) > (self.major, self.minor, self.prerelease)

		install -D -m 0755 \"\$srcdir/$BINARY_NAME\" \"\$pkgdir/usr/bin/gitmastery\"
		chmod 755 \"\$pkgdir/usr/bin/gitmastery\"

-        if ("beta" in version and len(parts) != 4) or len(parts) != 3:
+        if "beta" in version:
+            if len(parts) != 4:
+                raise ValueError(
+                    f"Invalid version string (expected 'MAJOR.MINOR.PATCH[-beta.PRERELEASE]'): {version!r}"
+                )
+        elif len(parts) != 3:

	MIN_GIT_VERSION = Version(2, 28, 0, None)
	MIN_GIT_VERSION = Version(2, 28, 0)

Conversation

VikramGoyal23 commented Mar 23, 2026

Uh oh!

jovnc commented Apr 11, 2026

Uh oh!

VikramGoyal23 commented Apr 13, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

jiaxinnns left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!