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.

Sign up for GitHub

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

Jump to bottom

Switch to npm, make packaging easier for linux users #1114

Closed
wants to merge 4 commits into from
Closed

Switch to npm, make packaging easier for linux users #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c19d0be
theseus_gui: pnpm -> npm
getchoo Apr 11, 2024
7e5a296
theseus_gui: don't use git dependencies in node
getchoo Apr 11, 2024
0f04ceb
ci: build tauri against modern ubuntu
getchoo Apr 11, 2024
d9bd4df
linux: create proper desktop file
getchoo Apr 11, 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
23 changes: 6 additions & 17 deletions .github/workflows/gui-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,18 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
- name: Install pnpm via corepack
cache: "npm"
- name: Install package manager via corepack
shell: bash
run: |
corepack enable
corepack prepare --activate
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Setup pnpm cache
uses: actions/cache@v3
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install dependencies
run: pnpm install
run: npm ci
- name: Run Lint
run: pnpm lint
run: npm run lint
- name: Build
run: pnpm build
run: npm run build
22 changes: 6 additions & 16 deletions .github/workflows/tauri-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04]
platform: [macos-latest, windows-latest, ubuntu-22.04]

runs-on: ${{ matrix.platform }}
defaults:
Expand Down Expand Up @@ -37,26 +37,16 @@ jobs:
workspaces: './src-tauri -> target'

- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
- name: Install pnpm via corepack
cache: "npm"

- name: Install package manager via corepack
shell: bash
run: |
corepack enable
corepack prepare --activate
- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Setup pnpm cache
uses: actions/cache@v3
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-

- name: install dependencies (ubuntu only)
if: startsWith(matrix.platform, 'ubuntu')
Expand All @@ -65,7 +55,7 @@ jobs:
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libselinux1

- name: Install frontend dependencies
run: pnpm install
run: npm ci

- name: build app (macos)
uses: tauri-apps/tauri-action@v0
Expand Down
Loading