Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
fail-fast: false
matrix:
include:
- platform: ubuntu-22.04
- platform: ubuntu-24.04
args: ''
- platform: windows-latest
args: ''
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9

- name: Install Linux deps
if: matrix.platform == 'ubuntu-22.04'
if: matrix.platform == 'ubuntu-24.04'
run: |
set -euxo pipefail
sudo apt-get update
Expand All @@ -183,11 +183,11 @@ jobs:

# ---------- Flatpak (Linux only; artifact) ----------
- name: Install Flatpak tooling
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
run: |
set -euxo pipefail
sudo apt-get update
sudo apt-get install -y --no-install-recommends flatpak flatpak-builder
sudo apt-get install -y --no-install-recommends flatpak flatpak-builder appstream
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install --user -y flathub org.gnome.Platform//48 org.gnome.Sdk//48
# Cargo/rustc must come from the Flatpak SDK environment (not the host toolchain).
Expand All @@ -197,21 +197,21 @@ jobs:
|| flatpak install --user -y flathub org.freedesktop.Sdk.Extension.rust-stable

- name: Verify Flatpak manifest exists
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
run: |
set -euxo pipefail
ls -la packaging/flatpak
test -f packaging/flatpak/io.github.jordonbc.OpenVCS.yml

- name: Build Flatpak bundle
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
run: |
set -euxo pipefail
flatpak-builder --user --force-clean --repo=repo build-flatpak packaging/flatpak/io.github.jordonbc.OpenVCS.yml
flatpak build-bundle repo OpenVCS.flatpak io.github.jordonbc.OpenVCS

- name: Upload Flatpak bundle (artifact)
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
uses: actions/upload-artifact@v4
with:
name: OpenVCS-flatpak-nightly
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
args: ${{ matrix.args }}

- name: Upload Flatpak bundle to GitHub Release
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload openvcs-nightly OpenVCS.flatpak --clobber
18 changes: 9 additions & 9 deletions .github/workflows/publish-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
include:
- platform: ubuntu-22.04
- platform: ubuntu-24.04
args: ''
- platform: windows-latest
args: ''
Expand All @@ -34,7 +34,7 @@ jobs:

- name: Compute version tag
id: version
if: matrix.platform == 'ubuntu-22.04'
if: matrix.platform == 'ubuntu-24.04'
shell: bash
run: |
set -euo pipefail
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9

- name: Install Linux build deps (Ubuntu)
if: matrix.platform == 'ubuntu-22.04'
if: matrix.platform == 'ubuntu-24.04'
shell: bash
run: |
set -euxo pipefail
Expand All @@ -77,12 +77,12 @@ jobs:

# ---------- Flatpak (Linux only; artifact) ----------
- name: Install Flatpak tooling
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
shell: bash
run: |
set -euxo pipefail
sudo apt-get update
sudo apt-get install -y --no-install-recommends flatpak flatpak-builder
sudo apt-get install -y --no-install-recommends flatpak flatpak-builder appstream
flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak install --user -y flathub org.gnome.Platform//48 org.gnome.Sdk//48
# Cargo/rustc must come from the Flatpak SDK environment (not the host toolchain).
Expand All @@ -92,23 +92,23 @@ jobs:
|| flatpak install --user -y flathub org.freedesktop.Sdk.Extension.rust-stable

- name: Verify Flatpak manifest exists
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
shell: bash
run: |
set -euxo pipefail
ls -la packaging/flatpak
test -f packaging/flatpak/io.github.jordonbc.OpenVCS.yml

- name: Build Flatpak bundle
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
shell: bash
run: |
set -euxo pipefail
flatpak-builder --user --force-clean --repo=repo build-flatpak packaging/flatpak/io.github.jordonbc.OpenVCS.yml
flatpak build-bundle repo OpenVCS.flatpak io.github.jordonbc.OpenVCS

- name: Upload Flatpak bundle (artifact)
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
uses: actions/upload-artifact@v4
with:
name: OpenVCS-flatpak-stable
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
# bundles: '' # e.g. 'deb,appimage,msi,nsis' if you want to restrict output

- name: Upload Flatpak bundle to GitHub Release
if: matrix.platform == 'ubuntu-22.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
if: matrix.platform == 'ubuntu-24.04' && hashFiles('packaging/flatpak/io.github.jordonbc.OpenVCS.yml') != ''
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: gh release upload "${{ steps.version.outputs.tag }}" OpenVCS.flatpak --clobber