Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup #34

Merged
merged 47 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
f115ccf
Cleanup
Jan 23, 2024
2735b22
Remove husky
Jan 23, 2024
869eab8
on pull request
Jan 23, 2024
75b0f9a
Removed un-needed files
Jan 23, 2024
4a32c5d
Removed un-needed files
Jan 23, 2024
ac6338e
Address review
Jan 23, 2024
788e17e
Improve linux build script
Jan 23, 2024
f335e56
Improve
Jan 23, 2024
a3950da
fix
Jan 23, 2024
ff48430
remove librs
Jan 23, 2024
8d14dac
fix
Jan 23, 2024
42cf930
fix
Jan 23, 2024
70b4f5d
fix
Jan 23, 2024
79a8774
use ubuntu 20.04
Jan 23, 2024
28b97e7
Add eslint
Jan 23, 2024
b0357e0
fix
Jan 23, 2024
ae89e4a
fix
Jan 23, 2024
bfe4861
wip
Jan 23, 2024
9708c53
trigger pipeline
Jan 23, 2024
9811915
wip
Jan 23, 2024
78908e9
wip
Jan 23, 2024
cfe660b
wip
Jan 23, 2024
14cf64b
wip
Jan 23, 2024
5faf101
wip
Jan 23, 2024
8f42ffe
Remove returns
Raduc4 Jan 23, 2024
644aa85
Remove cargo.lock
Raduc4 Jan 24, 2024
c10ecd2
fix
Raduc4 Jan 24, 2024
4a5576e
Migrate to v2
Jan 24, 2024
77ddd1e
try bun
Jan 24, 2024
dfbefad
Add pkg config debugging
Jan 24, 2024
51bd869
Add pkg config debugging
Jan 24, 2024
4f781d7
Add pkg config debugging
Jan 24, 2024
611abe2
Add pkg config debugging
Jan 24, 2024
3da8fd2
Add pkg config debugging
Jan 24, 2024
cf2db10
Add pkg config debugging
Jan 24, 2024
a978df6
Add pkg config debugging
Jan 24, 2024
a34ae8b
try remove homebrew
Jan 24, 2024
5f16a94
try remove homebrew
Jan 24, 2024
37f7c39
try remove homebrew
Jan 24, 2024
1471872
wip
Jan 24, 2024
a11f9d1
Simplify
Jan 24, 2024
d53a030
Change bun install action
Jan 24, 2024
b5983c6
yarn
Raduc4 Jan 24, 2024
f2f43df
remove bun
Jan 24, 2024
ce422fe
Remove select
Raduc4 Jan 24, 2024
b0be4b8
Added that config
Raduc4 Jan 24, 2024
f4bd8b4
Back to yarn defaults
Raduc4 Jan 24, 2024
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
99 changes: 99 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
name: Validate PR
on:
workflow_call:
pull_request:

concurrency:
group: ${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
CARGO_TERM_COLOR: always
RUST_BACKTRACE: full
# 40 MiB stack
RUST_MIN_STACK: 40971520
RUST_LOG: 'citadel=warn'

jobs:
fmt:
name: Cargo Fmt
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: Avarok-Cybersecurity/gh-actions-deps@master
- run: cargo fmt --check
clippy:
name: Cargo Clippy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: Avarok-Cybersecurity/gh-actions-deps@master
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
- name: install dependencies (ubuntu only)
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev
- name: install frontend dependencies
run: yarn install # change this to npm or pnpm depending on which one you use
- run: cargo clippy --all -- -D warnings
test:
name: Cargo Test
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v2
- uses: Avarok-Cybersecurity/gh-actions-deps@master
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
- name: install dependencies (ubuntu only)
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.1-dev libglvnd-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev libsoup-3.0-dev libsoup-3.0-0 libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev
- name: install frontend dependencies
run: yarn # change this to npm or pnpm depending on which one you use
- run: cargo test
tauri-build:
name: Tauri Build
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v2
- uses: Avarok-Cybersecurity/gh-actions-deps@master
- name: setup node
uses: actions/setup-node@v4
with:
node-version: 20
- name: install dependencies (ubuntu only)
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install -y libglvnd-dev libwebkit2gtk-4.1-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev
- run: cargo install create-tauri-app
- run: cargo install tauri-cli --version 2.0.0-alpha.21
- run: yarn install
- uses: tauri-apps/tauri-action@v0
eslint:
name: eslint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: install node v20
uses: actions/setup-node@v1
with:
node-version: 20
- name: yarn install
run: yarn install
- name: eslint
uses: icrawl/action-eslint@v1
with:
custom-glob: '**/*.{js,ts,tsx}'
16 changes: 10 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
node_modules/
out/
dist/
dist-ssr
*.local

/target/

target/
debug/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
Expand All @@ -29,7 +28,7 @@ Cargo.lock
/.next/
./next-env.d.ts
# Editor directories and files
.vscode/*
.vscode/
!.vscode/extensions.json
.idea
.DS_Store
Expand All @@ -38,3 +37,8 @@ Cargo.lock
*.njsproj
*.sln
*.sw?
src-tauri/gen
src-tauri/target
package-lock.json
yarn.lock
src-tauri/Cargo.lock
Empty file removed .husky/pre-commit
Empty file.
3 changes: 0 additions & 3 deletions .vscode/extensions.json

This file was deleted.

8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[workspace]
resolver = "2"
members = [
"src-tauri"
]

[workspace.dependencies]
citadel_workspace = { path = "../src-tauri" }
Binary file removed bun.lockb
Binary file not shown.
120 changes: 0 additions & 120 deletions components/ui/select.tsx

This file was deleted.

23 changes: 0 additions & 23 deletions next.config.cjs

This file was deleted.

5 changes: 5 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const nextConfig = {
output: 'export',
};

export default nextConfig;
Loading
Loading