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
94 changes: 16 additions & 78 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
pull_request:

jobs:
rust-preview:
rust:
runs-on: ubuntu-latest
container: archlinux:latest
timeout-minutes: 30
steps:
- name: Install native build dependencies
run: pacman -Syu --noconfirm base-devel clang cmake git pkgconf rustup python qt6-base sqlite cairo pango noto-fonts noto-fonts-cjk noto-fonts-emoji ttf-liberation poppler qpdf fontconfig freetype2 libxkbcommon libxcb wayland vulkan-headers vulkan-icd-loader
run: pacman -Syu --noconfirm base-devel clang cmake git pkgconf rustup python cairo pango noto-fonts noto-fonts-cjk noto-fonts-emoji ttf-liberation poppler qpdf fontconfig freetype2 libxkbcommon libxcb wayland vulkan-headers vulkan-icd-loader
- uses: actions/checkout@v4
- name: Create unprivileged build user
run: |
Expand All @@ -27,13 +27,13 @@ jobs:
runuser -u builder -- cargo test --workspace --locked
runuser -u builder -- cargo test -p accesskit_unix --lib --locked
runuser -u builder -- cargo clippy --workspace --all-targets --all-features --locked -- -D warnings
- name: Check Qt-free PDF structure and content
- name: Check PDF structure and content
env:
CARGO_BUILD_JOBS: 4
run: |
runuser -u builder -- cargo build -p notes-export --example pdf-check --locked
runuser -u builder -- python tests/test-rust-pdf.py target/debug/examples/pdf-check
- name: Check Rust and Qt storage compatibility
- name: Check Rust storage and backups
env:
CARGO_BUILD_JOBS: 4
run: |
Expand All @@ -44,97 +44,35 @@ jobs:
runuser -u builder -- python tests/test-rust-backups.py target/debug/omarchy-notes-preview --quote-driver target/debug/examples/quote-upgrade
runuser -u builder -- cargo build -p notes-storage --example organization-roundtrip --locked
runuser -u builder -- python tests/test-rust-organization.py target/debug/examples/organization-roundtrip
runuser -u builder -- cargo build -p notes-storage --example table-roundtrip --locked
runuser -u builder -- python tests/test-rust-tables.py target/debug/examples/table-roundtrip
- name: Check durable capture and instance protocol without a display
env:
CARGO_BUILD_JOBS: 4
run: |
runuser -u builder -- cargo build -p notes-platform --example instance-owner --locked
runuser -u builder -- python tests/test-rust-capture.py target/debug/omarchy-notes-preview target/debug/examples/instance-owner
- name: Check editable table compatibility with Qt
env:
CARGO_BUILD_JOBS: 4
run: |
runuser -u builder -- cargo build -p notes-storage --example table-roundtrip --locked
runuser -u builder -- python tests/test-rust-tables.py target/debug/examples/table-roundtrip

installer:
runs-on: ubuntu-latest
container: archlinux:latest
timeout-minutes: 5
steps:
- name: Install installer test tools
run: pacman -Syu --noconfirm bash curl python ripgrep shellcheck sudo util-linux
run: pacman -Syu --noconfirm bash curl git python ripgrep shellcheck sudo util-linux
- uses: actions/checkout@v4
- name: Create unprivileged test user
run: |
useradd --create-home builder
chown -R builder:builder "$GITHUB_WORKSPACE"
- name: Check installer syntax and lint
run: |
bash -n install.sh tests/test-installer.sh tests/test-installer-package.sh
shellcheck install.sh tests/test-installer.sh tests/test-installer-package.sh
bash -n install.sh tests/test-installer.sh tests/check-rust-arch-package.sh tests/test-rust-installer-package.sh
shellcheck install.sh tests/test-installer.sh tests/check-rust-arch-package.sh tests/test-rust-installer-package.sh
- name: Test installer without network or system changes
run: runuser -u builder -- ./tests/test-installer.sh
- name: Check separate Rust identity and immutable preparation
run: |
pacman -S --noconfirm --needed git
runuser -u builder -- python3 tests/test_rust_release.py

build-and-test:
runs-on: ubuntu-latest
container: archlinux:latest
timeout-minutes: 30
steps:
- name: Install build dependencies
run: pacman -Syu --noconfirm appstream base-devel cmake desktop-file-utils git ninja qt6-base qt6-declarative qt6-svg sqlite ttf-dejavu
- uses: actions/checkout@v4
- name: Create unprivileged test user
run: |
useradd --create-home builder
chown -R builder:builder "$GITHUB_WORKSPACE"
- name: Check release metadata
run: runuser -u builder -- ./tests/test-release-metadata.sh
- name: Verify production install tree
run: runuser -u builder -- ./tests/test-package-install.sh
- name: Build and test
run: |
runuser -u builder -- cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
runuser -u builder -- cmake --build build
runuser -u builder -- env QT_QPA_PLATFORM=offscreen QT_QUICK_BACKEND=software \
ctest --test-dir build --output-on-failure --timeout 300
- name: Keep editor screenshots
if: always()
uses: actions/upload-artifact@v4
with:
name: editor-screenshots
path: build/screenshots
if-no-files-found: ignore

arch-package:
runs-on: ubuntu-latest
container: archlinux:latest
timeout-minutes: 30
steps:
- name: Install packaging tools
run: pacman -Syu --noconfirm base-devel curl git namcap python ripgrep sudo util-linux
- uses: actions/checkout@v4
- name: Prepare source and AUR files
run: |
useradd --create-home builder
echo 'builder ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/builder
chmod 440 /etc/sudoers.d/builder
chown -R builder:builder "$GITHUB_WORKSPACE"
runuser -u builder -- git config --global --add safe.directory "$GITHUB_WORKSPACE"
runuser -u builder -- python3 packaging/prepare-release.py --ref HEAD --output build-aur-ci
# A systemd-nspawn chroot (extra-x86_64-build) can't run inside the
# job container; the container itself is fresh, and --syncdeps installs
# only the dependencies the PKGBUILD declares.
- name: Build the package from the AUR files
run: runuser -u builder -- bash -c 'cd build-aur-ci/aur && makepkg --syncdeps --noconfirm --cleanbuild'
- name: Validate package contents and dependencies
run: ./tests/check-arch-package.sh build-aur-ci/aur
- name: Install and verify through the installer in the disposable container
run: runuser -u builder -- ./tests/test-installer-package.sh build-aur-ci/aur
- name: Check Rust identity and immutable preparation
run: runuser -u builder -- python3 tests/test_rust_release.py

rust-arch-candidate:
runs-on: ubuntu-latest
Expand All @@ -144,19 +82,19 @@ jobs:
- name: Install Rust packaging tools
run: pacman -Syu --noconfirm appstream base-devel clang cmake curl desktop-file-utils git namcap pkgconf python ripgrep rustup shellcheck sudo util-linux
- uses: actions/checkout@v4
- name: Prepare immutable separate Rust candidate
- name: Prepare immutable Rust candidate
run: |
useradd --create-home builder
echo 'builder ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/builder
chmod 440 /etc/sudoers.d/builder
chown -R builder:builder "$GITHUB_WORKSPACE"
runuser -u builder -- git config --global --add safe.directory "$GITHUB_WORKSPACE"
runuser -u builder -- python3 packaging/prepare-release.py --edition rust --candidate --ref HEAD --output build-rust-ci
- name: Build from the archived Rust recipe and locked dependencies
runuser -u builder -- python3 packaging/prepare-release.py --candidate --ref HEAD --output build-rust-ci
- name: Build from the archived recipe and locked dependencies
run: runuser -u builder -- bash -c 'cd build-rust-ci/aur && makepkg --syncdeps --noconfirm --cleanbuild'
- name: Validate separate package metadata and files
- name: Validate package metadata and files
run: ./tests/check-rust-arch-package.sh build-rust-ci/aur
- name: Verify actual Rust install, alias, headless capture and retained data on removal
- name: Verify install, alias, headless capture and retained data on removal
run: runuser -u builder -- ./tests/test-rust-installer-package.sh build-rust-ci/aur
- name: Retain exact candidate identity
uses: actions/upload-artifact@v4
Expand Down
65 changes: 8 additions & 57 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,68 +2,19 @@ name: Release

on:
push:
tags: ["v*", "rust-v*"]
tags: ["rust-v*"]

permissions:
contents: write

jobs:
release:
if: startsWith(github.ref, 'refs/tags/v')
runs-on: ubuntu-latest
container: archlinux:latest
timeout-minutes: 40
steps:
- name: Install release dependencies
run: pacman -Syu --noconfirm appstream base-devel cmake curl desktop-file-utils git github-cli namcap ninja python qt6-base qt6-declarative qt6-svg shellcheck sqlite sudo util-linux
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Create unprivileged build user
run: |
useradd --create-home builder
chown -R builder:builder "$GITHUB_WORKSPACE"
runuser -u builder -- git config --global --add safe.directory "$GITHUB_WORKSPACE"
# gh (run as root below) also reads the checkout, now owned by builder.
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Verify tag and release metadata
run: runuser -u builder -- env GITHUB_REF_NAME="$GITHUB_REF_NAME" GITHUB_REF_TYPE="$GITHUB_REF_TYPE" ./tests/test-release-metadata.sh
- name: Verify production install
run: runuser -u builder -- ./tests/test-package-install.sh
- name: Verify installer
run: |
bash -n install.sh tests/test-installer.sh tests/test-installer-package.sh
shellcheck install.sh tests/test-installer.sh tests/test-installer-package.sh
runuser -u builder -- ./tests/test-installer.sh
- name: Prepare and validate release artifacts
run: |
runuser -u builder -- python3 packaging/prepare-release.py --ref "$GITHUB_REF_NAME" --output dist
runuser -u builder -- bash -c 'cd dist/aur && makepkg --noconfirm --cleanbuild'
./tests/check-arch-package.sh dist/aur
cp dist/aur/omarchy-notes-*.pkg.tar.zst dist/
cp install.sh dist/install.sh
cd dist
sha256sum ./*.tar.gz ./*.pkg.tar.zst install.sh SOURCE_REVISION > SHA256SUMS
- name: Write release notes from the changelog
run: |
version="${GITHUB_REF_NAME#v}"
awk -v v="$version" '$0 ~ "^## \\[" v "\\]" {on=1; next} /^## \[/ {on=0} on' CHANGELOG.md > dist/NOTES.md
test -s dist/NOTES.md
- name: Create draft GitHub release
env:
GH_TOKEN: ${{ github.token }}
run: >-
gh release create "$GITHUB_REF_NAME" dist/*.tar.gz dist/*.pkg.tar.zst
dist/install.sh dist/SHA256SUMS dist/SOURCE_REVISION --title "Omarchy Notes ${GITHUB_REF_NAME}"
--notes-file dist/NOTES.md --verify-tag --draft

rust-release:
if: startsWith(github.ref, 'refs/tags/rust-v')
runs-on: ubuntu-latest
container: archlinux:latest
timeout-minutes: 90
steps:
- name: Install separate Rust release dependencies
- name: Install Rust release dependencies
run: pacman -Syu --noconfirm appstream base-devel clang cmake curl desktop-file-utils git github-cli namcap pkgconf python ripgrep rustup shellcheck sudo util-linux
- uses: actions/checkout@v4
with:
Expand All @@ -76,15 +27,15 @@ jobs:
chown -R builder:builder "$GITHUB_WORKSPACE"
runuser -u builder -- git config --global --add safe.directory "$GITHUB_WORKSPACE"
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Verify immutable Rust metadata and installer
- name: Verify immutable metadata and installer
run: |
runuser -u builder -- python3 tests/test_rust_release.py
bash -n install.sh tests/check-rust-arch-package.sh tests/test-rust-installer-package.sh
shellcheck install.sh tests/check-rust-arch-package.sh tests/test-rust-installer-package.sh
bash -n install.sh tests/test-installer.sh tests/check-rust-arch-package.sh tests/test-rust-installer-package.sh
shellcheck install.sh tests/test-installer.sh tests/check-rust-arch-package.sh tests/test-rust-installer-package.sh
runuser -u builder -- ./tests/test-installer.sh
- name: Prepare stable Rust artifacts from the exact Rust tag
- name: Prepare stable artifacts from the exact Rust tag
run: |
runuser -u builder -- python3 packaging/prepare-release.py --edition rust --ref "$GITHUB_REF_NAME" --output dist-rust
runuser -u builder -- python3 packaging/prepare-release.py --ref "$GITHUB_REF_NAME" --output dist-rust
runuser -u builder -- bash -c 'cd dist-rust/aur && makepkg --syncdeps --noconfirm --cleanbuild'
./tests/check-rust-arch-package.sh dist-rust/aur
runuser -u builder -- ./tests/test-rust-installer-package.sh dist-rust/aur
Expand All @@ -102,7 +53,7 @@ jobs:
exit 1
fi
cp docs/rust-release-notes.md dist-rust/NOTES.md
- name: Create separate draft Rust release
- name: Create draft Rust release
env:
GH_TOKEN: ${{ github.token }}
run: |
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to Omarchy Notes are documented here. The project uses

## [Unreleased]

### Changed

- Rust/GPUI is now the only app implementation and installer target. Existing
Rust executable names and data directories remain unchanged.

### Removed

- Retired Qt/C++/QML app, CMake build, Qt packages and live Qt test probes.
Frozen legacy library fixtures remain for Rust migration regression tests.

### Added

- Command-line installer with formatted progress, verified Arch release
Expand Down
41 changes: 0 additions & 41 deletions CMakeLists.txt

This file was deleted.

Loading
Loading