Skip to content

Commit

Permalink
Merge pull request #3 from tau-OS/main
Browse files Browse the repository at this point in the history
Pull main into stable (0.4.0)
  • Loading branch information
lleyton authored Aug 4, 2024
2 parents eb9e2e6 + e45c64b commit 87a254d
Show file tree
Hide file tree
Showing 56 changed files with 8,163 additions and 4,217 deletions.
70 changes: 16 additions & 54 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,22 @@ jobs:
deploy:
name: Deploy to GitHub Pages
runs-on: ubuntu-latest
container:
image: registry.fedoraproject.org/fedora-minimal:40
steps:
- uses: actions/checkout@v3
with:
submodules: "recursive"
- uses: actions/setup-node@v3
with:
node-version: 14
- run: npm install -g sass

- name: Update repos
run: sudo apt update
- name: Install required packages
run: |
dnf5 update -y --setopt=install_weak_deps=False
dnf5 install -y --setopt=install_weak_deps=False dnf5-plugins
dnf5 config-manager addrepo --from-repofile='https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo'
dnf5 install -y libhelium-devel libbismuth-devel sass git rust cargo rustdoc rustfmt meson ninja vala 'pkgconfig(gnome-desktop-4)' 'pkgconfig(accountsservice)' 'pkgconfig(udisks2)' 'pkgconfig(gudev-1.0)' 'pkgconfig(libgtop-2.0)' 'pkgconfig(gexiv2)' 'pkgconfig(gweather4)' 'pkgconfig(libpulse)' 'pkgconfig(ibus-1.0)' 'pkgconfig(gl)' desktop-file-utils
- name: Install system level libraries
run: sudo apt install libpango1.0-dev libgtk-4-dev libgee-0.8-dev libgexiv2-dev meson ninja-build valac valadoc libpulse-dev libgnome-desktop-4-dev libgweather-4-dev libaccountsservice-dev libudisks2-dev libgudev-1.0-dev libgtop2-dev libxml2-dev libibus-1.0-dev desktop-file-utils

- name: Checkout libhelium
uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: tau-OS/libhelium
path: libhelium-src
- name: Install libhelium
run: meson build -Ddemo=false
working-directory: ./libhelium-src
- name: Build libhelium with Ninja
run: ninja
working-directory: ./libhelium-src/build
- name: Install libhelium globally
run: sudo ninja install
working-directory: ./libhelium-src/build

- name: Checkout libbismuth
uses: actions/checkout@v3
with:
repository: tau-OS/libbismuth
path: libbismuth-src
- name: Install libbismuth
run: meson build
working-directory: ./libbismuth-src
- name: Build libbismuth with Ninja
run: ninja
working-directory: ./libbismuth-src/build
- name: Install libbismuth globally
run: sudo ninja install
working-directory: ./libbismuth-src/build
submodules: "recursive"

- name: Checkout fusebox
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: tau-OS/fusebox
path: fusebox-src
Expand All @@ -75,28 +44,21 @@ jobs:
run: ninja
working-directory: ./fusebox-src/build
- name: Install fusebox globally
run: sudo ninja install
run: ninja install
working-directory: ./fusebox-src/build

- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
default: true
components: rustfmt, clippy

- name: Generate docs
run: cargo install rustdoc-stripper
- run: ./generator.py --embed-docs
- run: PATH="$HOME/.cargo/bin:$PATH" ./generator.py --embed-docs
- run: cargo doc --no-deps
- run: mv target/doc/ docs

- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: "docs/"
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 87a254d

Please sign in to comment.