Skip to content

Commit

Permalink
Merge pull request #54 from catalystneuro/hotfix/fix-vame-desktop-issues
Browse files Browse the repository at this point in the history
Fix/fix-vame-desktop-issues
  • Loading branch information
nathan-vm authored Aug 29, 2024
2 parents 95b020f + be2674e commit 561788f
Show file tree
Hide file tree
Showing 16 changed files with 1,202 additions and 455 deletions.
20 changes: 14 additions & 6 deletions .github/workflows/build-and-release-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:

jobs:
deploy-on-linux:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

defaults:
run:
Expand All @@ -26,15 +26,23 @@ jobs:
with:
python-version: "3.11"

- name: install python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- uses: actions/setup-node@v4
with:
node-version: "20"

- name: install necessary libs
run: |
sudo apt-get install build-essential clang libdbus-1-dev libgtk-3-dev \
libnotify-dev libasound2-dev libcap-dev \
libcups2-dev libxtst-dev \
libxss1 libnss3-dev gcc-multilib g++-multilib curl \
gperf bison python3-dbusmock openjdk-8-jre
- name: install python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Install dependencies
run: npm install

Expand Down
22 changes: 15 additions & 7 deletions .github/workflows/test-build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ run-name: ${{ github.actor }} is building for Linux.

on:
pull_request:
branches: [ main ]
branches: [main]

jobs:
test-on-linux:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

defaults:
run:
Expand All @@ -20,15 +20,23 @@ jobs:
with:
python-version: "3.11"

- name: install python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- uses: actions/setup-node@v4
with:
node-version: "20"

- name: install necessary libs
run: |
sudo apt-get install build-essential clang libdbus-1-dev libgtk-3-dev \
libnotify-dev libasound2-dev libcap-dev \
libcups2-dev libxtst-dev \
libxss1 libnss3-dev gcc-multilib g++-multilib curl \
gperf bison python3-dbusmock openjdk-8-jre
- name: install python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Install dependencies
run: npm install

Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ VAME Desktop has been designed to run each step of a VAME project **only once**.

## Installation

### Requirement:

For some images functions (as UMAP images) [ffmpeg](https://www.ffmpeg.org/) is needed.

Download page: https://www.ffmpeg.org/download.html

### Download Desktop versions:

You can find installers for VAME Desktop on the [release page](https://github.com/catalystneuro/vame-desktop/releases).
Expand Down
3 changes: 0 additions & 3 deletions dev-app-update.yml

This file was deleted.

1 change: 1 addition & 0 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@ linux:
npmRebuild: false
publish:
provider: github
publishAutoUpdate: false
electronDownload:
mirror: https://npmmirror.com/mirrors/electron/
Loading

0 comments on commit 561788f

Please sign in to comment.