Skip to content

Add Ubuntu 22.04 builds and upgrade core Linux dependencies #11412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
slarse wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Add Ubuntu 22.04 builds and upgrade core Linux dependencies #11412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6aa0fa6
Add Ubuntu 22.04 builds
slarse Nov 30, 2025
74b8525
Upgrade build dependencies
slarse Nov 30, 2025
5f9f531
Make the rust-cache specific to the platform when publishing.
Byron Dec 1, 2025
2df80e9
Revert "Upgrade build dependencies"
slarse Dec 3, 2025
dd2164e
Add distro codename into RELEASE_DIR path for linux
slarse Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ jobs:
target: ''
- platform: ubuntu-24.04-arm # [linux, ARM64]
target: ''
- platform: ubuntu-22.04 # [linux, x64]
target: ''
- platform: ubuntu-22.04-arm # [linux, ARM64]
target: ''
Comment on lines +105 to +106
Copy link
Contributor Author

@slarse slarse Nov 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As noted in OP, I'm really unsure if this build is desirable.

- platform: windows-latest # [windows, x64]
target: ''

Expand Down Expand Up @@ -141,7 +145,7 @@ jobs:
- name: Rust Cache ${{ matrix.target }}
uses: Swatinem/rust-cache@v2.8.1
with:
shared-key: app-release-build-${{ github.event.inputs.channel || 'nightly' }}${{ matrix.target }}
shared-key: app-release-build-${{ github.event.inputs.channel || 'nightly' }}${{ matrix.target }}${{ matrix.platform }}
- name: Init Node Environment
uses: ./.github/actions/init-env-node

Expand Down Expand Up @@ -352,6 +356,10 @@ jobs:
target: ''
- platform: ubuntu-24.04-arm # [linux, ARM64]
target: ''
- platform: ubuntu-22.04 # [linux, x64]
target: ''
- platform: ubuntu-22.04-arm # [linux, ARM64]
target: ''
- platform: windows-latest # [windows, x64]
target: ''
steps:
Expand Down
8 changes: 8 additions & 0 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,15 @@ else
BUNDLE_DIR=$(readlink -f "$PWD/../target/release/bundle")
fi

# The release dir determines a (significant portion of) the final S3 object key.
RELEASE_DIR="$DIST/$OS/$ARCH"
if [ "$OS" = "linux" ]; then
# We build for multiple linux distros and need distinct keys for them.
RELEASE_DIR="$DIST/$OS/$(lsb_release -cs)/$ARCH"
fi
Comment on lines +222 to +227
Copy link
Contributor Author

@slarse slarse Dec 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Byron As you thought, there was probably a last-write-wins situation going on with the S3 uploads for the Linux releases. This should address that (if I've finally actually understood how the S3 keys are determined), BUT it is not enough. There's a part of the publish.yaml workflow that notifies the GB API of the new version

gitbutler/.github/workflows/publish.yaml

Lines 398 to 406 in 0e8b4cc

- name: Notify GitButler API of new release
shell: bash
run: |
curl 'https://app.gitbutler.com/api/releases' \
--fail \
--request POST \
--header 'Content-Type: application/json' \
--header 'X-Auth-Token: ${{ secrets.BOT_AUTH_TOKEN }}' \
--data '{"channel":"${{ needs.build-tauri.outputs.channel }}","version":"${{ env.version }}-${{ github.run_number }}","sha":"${{ github.sha }}"}'

A quick peek into that API shows this:

$ curl -s https://app.gitbutler.com/releases/ | jq
{
  "version": "0.18.2",
  "notes": "- Improved UX of branch reordering, making creating / splitting stacks of branches more intuitive\n- Fixes a bug with commit message / PR description inputs preventing creating new lines (paragraphs)\n- Codegen - fixes a bug with full commands not being shown in permission requests",
  "pub_date": "2025-11-29T14:53:27+00:00",
  "platforms": {
    <snip>
    "linux-aarch64": {
      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUck9FSStpbTFYWUxuWGxGNEdyRDhKRHMzdGpQamhacEhOcVJRYTJNYzJHdVl5RDJ0OG9jbytlUXBUYVphWkNBbkw1RWxSYVFPQ1ZMUHZkMWVGV1J3cjRENmZXOTQ4S1FFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzY0NDI0NTg3CWZpbGU6R2l0QnV0bGVyXzAuMTguMl9hYXJjaDY0LkFwcEltYWdlLnRhci5negpXSEhmOVhIUHcwVi9mSS9PWkJHOUxwVmxGbmhxY1ZlMjZPQ25LRWYzQXBEc2plVnM5Qms3N0hUV0wrVDNvZjh5bGYrVGIzZEdJWnRzaURYUkFmYUdCQT09Cg==",
      "url": "https://releases.gitbutler.com/releases/release/0.18.2-2660/linux/aarch64/GitButler_0.18.2_aarch64.AppImage.tar.gz"
    },
    "linux-x86_64": {
      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUck9FSStpbTFYWUQ0cnVYQ3VEYzhKUWhlUHMwdmovamtwTnlMWE1jY2Y2MGlIUms4c21BSWNUK3RUNzNYbDNDT0E2TU1EN2VnQmg0aUZkQnlYS2hqbGRjUUNRY2t1S1FVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzY0NDI0NTIwCWZpbGU6R2l0QnV0bGVyXzAuMTguMl9hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKbnc2SFNoc2dqcDRReDUzTDZxdEhuWEhxMVUwSy9EQkZYU2ZSNHJjVzRPL2o4TFA0aytRbXR4Z0hOWUhpd2tXUVVaeXE0UG1NVGZNU0xIU2tyd3ZSQ2c9PQo=",
      "url": "https://releases.gitbutler.com/releases/release/0.18.2-2660/linux/x86_64/GitButler_0.18.2_amd64.AppImage.tar.gz"
    }
  }
}

That API needs to be updated, along with the website page that shows downloads: https://gitbutler.com/downloads

And potentially also the Tauri updater plugin URLs, I don't really know how those work.

This super easy, barely an inconvenience little thing turned out to be all kinds of inconvenient :)

Copy link
Collaborator

@Byron Byron Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for validating my worst fears 😅.

With this PR not updating dependencies anymore, I think what's left to be done here is to update the backend to deal with this.
It's something I can't do, but @Caleb-T-Owens could. Next week @krlvi is back as well and I'd hope he can double-check the course of action, which is aptly summarised in your comment on Discord.


echo "Resolved RELEASE_DIR=$RELEASE_DIR"

mkdir -p "$RELEASE_DIR"

if [ "$OS" = "macos" ]; then
Expand Down
Loading