Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into community
Browse files Browse the repository at this point in the history
  • Loading branch information
J-ZhengLi committed Dec 5, 2024
2 parents d31669a + 05b32c9 commit c8534b7
Show file tree
Hide file tree
Showing 117 changed files with 1,672 additions and 568 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ on:
push:
branches: [ "master" ]
paths:
- 'installer/**'
- 'rim_gui/**'
pull_request:
branches: [ "master" ]
paths:
- 'installer/**'
- 'rim_gui/**'

concurrency:
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
Expand Down
63 changes: 63 additions & 0 deletions .github/workflows/publish-doc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Generate Docs

on:
workflow_dispatch:
push:
branches: [ "master" ]
paths:
- '**.rs'

permissions:
contents: read
pages: write
id-token: write

concurrency:
group: deploy
cancel-in-progress: true

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v4
with:
node-version: lts/*

- name: install Rust stable
uses: dtolnay/rust-toolchain@stable

- name: install dependencies (ubuntu only)
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
- name: Config pages
id: pages
uses: actions/configure-pages@v5

- name: Build docs
run: cargo doc --no-deps --workspace --document-private-items

- name: Add redirect
run: echo '<meta http-equiv="refresh" content="0;url=rim/index.html">' > target/doc/index.html

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: target/doc

deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
95 changes: 82 additions & 13 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rim"
version = "0.3.0"
version = "0.3.1"
edition = "2021"
description = "An interactive Rust installation manager"
rust-version = "1.73.0" # Minimal required version to use `zip`
Expand All @@ -12,10 +12,10 @@ gui = []

[[bin]]
name = "rim-cli"
path = "src/bin/installer.rs"
path = "src/bin/rim_cli.rs"

[workspace]
members = ["installer/src-tauri", "rim_dev"]
members = ["rim_gui/src-tauri", "rim_dev"]

[workspace.dependencies]
serde = { version = "1", features = ["derive"] }
Expand Down
Loading

0 comments on commit c8534b7

Please sign in to comment.