Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,10 @@ jobs:
with:
node-version-file: .nvmrc
cache: npm
- name: 🐍 Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.12

# Install dependencies
- name: 🅿️ Install Python tools
run: pip install setuptools
# Install dependencies and set up environment
- name: 📥 Install Dependencies
run: npm ci

# Set up the environment
- name: 🔃 Load .env file (.env.${{matrix.setting}})
uses: xom9ikk/dotenv@v2
with:
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,10 @@ jobs:
with:
node-version-file: .nvmrc
cache: npm
- name: 🐍 Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.12

# Install dependencies and set up environment
- name: 🅿️ Install Python tools
run: pip install setuptools
- name: 📥 Install Dependencies
run: npm ci

# Set up the environment
- name: 🔃 Load .env file (.env.${{matrix.setting}})
uses: xom9ikk/dotenv@v2
with:
Expand Down
44 changes: 24 additions & 20 deletions .github/workflows/workflow-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ on:
description: Package the app for 'home' or 'clinic' use
os:
type: choice
description: Which operating system to make executables for
required: true
default: "All"
options:
- "All"
- "Windows"
- "macOS"
- "Linux"
default: "All"
required: true
description: Which OS to package

jobs:
package-and-upload:
Expand All @@ -31,6 +31,7 @@ jobs:
# Run action for [home/clinic] in [windows/macOS/ubuntu] based on user input
strategy:
matrix:
# TODO: There's got to be a better way to handle this?
os: ${{
(github.event.inputs.os == 'All' && fromJSON('["ubuntu-latest", "macOS-latest", "windows-latest"]')) ||
(github.event.inputs.os == 'Windows' && fromJSON('["windows-latest"]')) ||
Expand All @@ -48,34 +49,32 @@ jobs:
with:
node-version-file: .nvmrc
cache: npm
- name: 🐍 Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.12

# Install dependencies and set up environment
- name: 🅿️ Install Python tools
run: pip install setuptools
- name: 📥 Install Dependencies
run: npm ci

# Set up the environment
- name: 🔃 Load .env file (.env.${{github.event.inputs.setting}})
uses: xom9ikk/dotenv@v2
with:
path: ./env
mode: ${{github.event.inputs.setting}}

- run: echo ${{matrix.os}}
shell: bash

# Package the app and make the installers
- name: 📦 Make app installer - Windows
if: startsWith(matrix.os, 'windows')
run: npm run make:windows
- name: 📦 Make app installer - Mac
if: startsWith(matrix.os, 'mac')
run: npm run make:mac
- name: 📦 Make app installer - Linux
if: startsWith(matrix.os, 'ubuntu')
run: npm run make:linux
- name: 📦 Make app installer
run: npm run make

# - name: 📦 Make app installer - Windows
# if: startsWith(matrix.os, 'windows')
# run: npm run make:windows
# - name: 📦 Make app installer - Mac
# if: startsWith(matrix.os, 'mac')
# run: npm run make:mac
# - name: 📦 Make app installer - Linux
# if: startsWith(matrix.os, 'ubuntu')
# run: npm run make:linux

# Get package info
- name: Get package name and version
Expand All @@ -85,6 +84,11 @@ jobs:
echo "version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
shell: bash

- run: ls ./out/make
shell: bash

# TODO: These will fail

# Upload installers to github action
# TODO @brown-ccv #247: Can we use the publish command here?
- name: ⬆ Upload installer - Windows
Expand Down
7 changes: 2 additions & 5 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,5 @@
# Visit https://brown-ccv.github.io/honeycomb-docs/docs/quick_start for info
brew "git"
cask "github"
brew "openjdk" # NOTE @brown-ccv: This will install Python as a dependency
brew "python-setuptools"
cask "visual-studio-code"

# TODO @brown-ccv #278: Python management (miniconda)? [Python is only needed for PsiTurk]
brew "openjdk"
cask "visual-studio-code"
4 changes: 0 additions & 4 deletions forge.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ export default {
},
},
},
{
// zip files
name: "@electron-forge/maker-zip",
},
],
plugins: [
{ name: "@electron-forge/plugin-auto-unpack-natives", config: {} },
Expand Down
Loading