Skip to content

Commit

Permalink
Merge branch 'main' into prepare-backends
Browse files Browse the repository at this point in the history
  • Loading branch information
meisenzahl committed Sep 25, 2024
2 parents a27bda7 + fe60a17 commit c69236b
Show file tree
Hide file tree
Showing 254 changed files with 16,524 additions and 14,248 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-deb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/elementary/docker:horus-unstable
image: ghcr.io/elementary/docker:development-target

steps:
- name: Install dependencies
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
cp ../*.deb output/
- name: Save .deb package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: deb-files
path: output/*.deb
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ jobs:
- name: Install Dependencies
run: |
apt update
apt install -y desktop-file-utils gettext libdistinst-dev libgtk-3-dev libgee-0.8-dev libgranite-dev libhandy-1-dev libxml2-dev libjson-glib-dev libgnomekbd-dev libpwquality-dev libxml2-utils meson valac
- name: Build
apt install -y desktop-file-utils gettext libadwaita-1-dev libdistinst-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libxml2-dev libjson-glib-dev libpwquality-dev libxml2-utils meson valac
- name: Build and Test
env:
DESTDIR: out
run: |
meson build
ninja -C build
meson setup build
ninja -C build install
lint:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gettext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Gettext Updates

on:
push:
branches: [master]
branches: [main]

jobs:
build:
Expand All @@ -22,7 +22,7 @@ jobs:
token: ${{ secrets.GIT_USER_TOKEN }}

- name: Update Translation Files
uses: elementary/actions/gettext-template@next
uses: elementary/actions/gettext-template@main
env:
GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
GIT_USER_NAME: "elementaryBot"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release

on:
pull_request:
branches: [master]
branches: [main]
types: [closed]

jobs:
Expand All @@ -29,4 +29,4 @@ jobs:
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "[email protected]"
with:
release_branch: "horus"
release_branch: "noble"
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ You'll need the following dependencies:
- gettext
- gparted
- libgnomekbd-dev
- libgranite-dev >= 0.5
- libgtk-3-dev
- libgranite-7-dev >=7.4.0
- libgtk-4-dev
- libgee-0.8-dev
- libhandy-1-dev
- libadwaita-1-dev >=1.4.0
- libjson-glib-dev
- libpwquality-dev
- libxml2-dev
Expand Down
44 changes: 0 additions & 44 deletions common/DBusStructures.vala
Original file line number Diff line number Diff line change
Expand Up @@ -79,50 +79,6 @@ public enum InstallerDaemon.FileSystem {
}
}

public struct InstallerDaemon.PartitionUsage {
/**
* None = 0; Some(usage) = 1;
*/
public uint8 tag;
/**
* The size, in sectors, that a partition is used.
*/
public uint64 value;
}

public enum InstallerDaemon.PartitionTable {
NONE,
GPT,
MSDOS;
}

public enum InstallerDaemon.Step {
BACKUP,
INIT,
PARTITION,
EXTRACT,
CONFIGURE,
BOOTLOADER;
}

public struct InstallerDaemon.Status {
Step step;
int percent;
}

public enum InstallerDaemon.LogLevel {
TRACE,
DEBUG,
INFO,
WARN,
ERROR;
}

public struct InstallerDaemon.Error {
Step step;
int err;
}

public struct InstallerDaemon.Partition {
string device_path;

Expand Down
Loading

0 comments on commit c69236b

Please sign in to comment.