Skip to content

Commit

Permalink
Rename project from ESPlant to Blumy (#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dennis960 authored Sep 2, 2024
1 parent d82997a commit 5e6f514
Show file tree
Hide file tree
Showing 378 changed files with 716 additions and 718 deletions.
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
name: Build ESPlant-Server
name: Build Blumy-Server
on:
push:
branches:
- main
paths:
- "ESPlant-Server/**"
- ".github/workflows/build.esplant-server.workflow.yml"
- "Blumy-Server/**"
- ".github/workflows/build.blumy-server.workflow.yml"
pull_request:
branches:
- main
paths:
- "ESPlant-Server/**"
- "Blumy-Server/**"

jobs:
test-playwright:
uses: ./.github/workflows/test.playwright.esplant-server.workflow.yml
uses: ./.github/workflows/test.playwright.blumy-server.workflow.yml

docker_publish:
runs-on: "ubuntu-20.04"
Expand All @@ -37,5 +37,5 @@ jobs:
image_tag: ${{ steps.extract_branch.outputs.branch }}.${{ github.run_number }},${{ steps.extract_branch.outputs.branch }}.latest
image_name: ${{ github.repository }}/server
github_token: ${{ secrets.GITHUB_TOKEN }}
dockerfile: ESPlant-Server/Dockerfile.build
context: ESPlant-Server
dockerfile: Blumy-Server/Dockerfile.build
context: Blumy-Server
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy ESPlant-Server
name: Deploy Blumy-Server
on:
workflow_dispatch:
inputs:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
with:
SSH_PRIVATE_KEY: ${{ secrets.HOPPING_KEY }}
ARGS: "-rlgoDzvc -i"
SOURCE: "ESPlant-Server/docker-compose.yml"
SOURCE: "Blumy-Server/docker-compose.yml"
REMOTE_HOST: ${{ secrets.HOPPING_HOST }}
REMOTE_USER: ${{ secrets.HOPPING_USER }}
TARGET: ${{ secrets.HOPPING_HOST_PATH }}/
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/deploy.firmware.workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
branches:
- main
paths:
- "ESPlant-Firmware/**"
- "Blumy-Firmware/**"
- ".github/workflows/deploy.firmware.workflow.yml"
pull_request:
branches:
- main
paths:
- "ESPlant-Firmware/**"
- "Blumy-Firmware/**"
- ".github/workflows/deploy.firmware.workflow.yml"

jobs:
Expand All @@ -24,17 +24,17 @@ jobs:

- name: Install Dependencies
run: npm ci
working-directory: ESPlant-Firmware/frontend
working-directory: Blumy-Firmware/frontend

- name: Build Frontend
run: npm run build
working-directory: ESPlant-Firmware/frontend
working-directory: Blumy-Firmware/frontend

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: frontend
path: ESPlant-Firmware/main/index_html.c
path: Blumy-Firmware/main/index_html.c

build-firmware:
runs-on: ubuntu-latest
Expand All @@ -48,20 +48,20 @@ jobs:
uses: actions/download-artifact@v4
with:
name: frontend
path: ESPlant-Firmware/main
path: Blumy-Firmware/main

- name: Build Firmware
run: |
docker run --rm -v $PWD:/project -w /project/ESPlant-Firmware -u $UID -e HOME=/tmp espressif/idf idf.py build
docker run --rm -v $PWD:/project -w /project/Blumy-Firmware -u $UID -e HOME=/tmp espressif/idf idf.py build
- name: Rename ESPlant-Firmware to firmware
run: mv ESPlant-Firmware/build/ESPlant-Firmware.bin ESPlant-Firmware/build/firmware.bin
- name: Rename Blumy-Firmware to firmware
run: mv Blumy-Firmware/build/Blumy-Firmware.bin Blumy-Firmware/build/firmware.bin

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: firmware
path: ESPlant-Firmware/build/firmware.bin
path: Blumy-Firmware/build/firmware.bin

deploy-firmware:
runs-on: ubuntu-latest
Expand Down
54 changes: 54 additions & 0 deletions .github/workflows/generate.blumy-board.workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Export Blumy-Board with KiCad
on:
push:
paths:
- "Blumy-Board/Blumy-Board.kicad_sch"
- "Blumy-Board/Blumy-Board.kicad_pcb"
- .github/workflows/generate.blumy-board.workflow.yml
workflow_dispatch:
jobs:
export:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- name: Add KiCad PPA and install KiCad
run: |
sudo add-apt-repository --yes ppa:kicad/kicad-dev-nightly
sudo apt update
sudo apt install --install-recommends kicad-nightly
- name: Create dist folder
run: |
mkdir -p Blumy-Board/dist
- name: Export Blumy-Board
run: |
kicad-cli-nightly sch export pdf Blumy-Board/Blumy-Board.kicad_sch -o Blumy-Board/dist/Blumy-Board-schematic.pdf
kicad-cli-nightly sch export svg Blumy-Board/Blumy-Board.kicad_sch -o Blumy-Board/dist/Blumy-Board-schematic.svg
kicad-cli-nightly pcb export pdf Blumy-Board/Blumy-Board.kicad_pcb --layers F.Cu,B.Cu,F.Silkscreen,B.Silkscreen,User.Drawings,User.Comments,Edge.Cuts -o Blumy-Board/dist/Blumy-Board-pcb.pdf
kicad-cli-nightly pcb export vrml Blumy-Board/Blumy-Board.kicad_pcb -o Blumy-Board/dist/Blumy-Board.wrl
kicad-cli-nightly pcb export step Blumy-Board/Blumy-Board.kicad_pcb --drill-origin --no-dnp --subst-models -o Blumy-Board/dist/Blumy-Board.step
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: Blumy-Board
path: Blumy-Board/dist
upload:
runs-on: ubuntu-latest
needs: export
steps:
- name: Download artifacts
uses: actions/download-artifact@v3
with:
name: Blumy-Board
path: Blumy-Board
- name: Upload to server
uses: easingthemes/ssh-deploy@main
with:
SSH_PRIVATE_KEY: ${{ secrets.HOPPING_KEY }}
ARGS: "-rlgoDzvc -i"
SOURCE: "Blumy-Board/"
REMOTE_HOST: ${{ secrets.HOPPING_HOST }}
REMOTE_USER: ${{ secrets.HOPPING_USER }}
TARGET: ${{ secrets.HOPPING_HOST_PATH }}/api/pages/Blumy-Board

54 changes: 0 additions & 54 deletions .github/workflows/generate.esplant-board.workflow.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
postgres:
image: postgres:alpine
env:
POSTGRES_USER: esplant
POSTGRES_PASSWORD: esplant
POSTGRES_DB: esplant_test
POSTGRES_USER: blumy
POSTGRES_PASSWORD: blumy
POSTGRES_DB: blumy_test
ports:
- 5432:5432
options: >-
--health-cmd="pg_isready -U esplant"
--health-cmd="pg_isready -U blumy"
--health-interval=10s
--health-timeout=5s
--health-retries=5
Expand All @@ -39,30 +39,30 @@ jobs:
uses: actions/cache@v4
with:
path: |
ESPlant-Server/node_modules
key: modules-${{ hashFiles('ESPlant-Server/package-lock.json') }}
Blumy-Server/node_modules
key: modules-${{ hashFiles('Blumy-Server/package-lock.json') }}

- name: Cache Playwright Binaries
id: cache-playwright
uses: actions/cache@v4
with:
path: |
~/.cache/ms-playwright
key: playwright-${{ hashFiles('ESPlant-Server/package-lock.json') }}
key: playwright-${{ hashFiles('Blumy-Server/package-lock.json') }}

- name: Install dependencies
if: steps.cache-node-modules.outputs.cache-hit != 'true'
working-directory: ESPlant-Server
working-directory: Blumy-Server
run: npm ci

- name: Install Playwright Browsers
if: steps.cache-playwright.outputs.cache-hit != 'true'
working-directory: ESPlant-Server
working-directory: Blumy-Server
run: npx playwright install --with-deps

- name: Wait for PostgreSQL to be ready
run: |
until pg_isready -h localhost -U esplant; do
until pg_isready -h localhost -U blumy; do
echo "Waiting for PostgreSQL..."
sleep 2
done
Expand All @@ -71,22 +71,22 @@ jobs:
env:
POSTGRES_HOST: localhost
POSTGRES_PORT: 5432
POSTGRES_USER: esplant
POSTGRES_PASSWORD: esplant
POSTGRES_DB: esplant_test
POSTGRES_USER: blumy
POSTGRES_PASSWORD: blumy
POSTGRES_DB: blumy_test

GOOGLE_CLIENT_ID: DOES_NOT_MATTER
GOOGLE_CLIENT_SECRET: DOES_NOT_MATTER
PUBLIC_BASE_URL: http://localhost:4173
working-directory: ESPlant-Server
working-directory: Blumy-Server
run: npm run test:integration

- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: ESPlant-Server/test-results
path: Blumy-Server/test-results
retention-days: 30
- name: Run CTRF annotations
run: npx github-actions-ctrf ESPlant-Server/test-results/ctrf-report.json
run: npx github-actions-ctrf Blumy-Server/test-results/ctrf-report.json
if: always()
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"zone_display_mode": 1
},
"meta": {
"filename": "ESPlant-Board.kicad_prl",
"filename": "Blumy-Board.kicad_prl",
"version": 3
},
"project": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions ESPlant-Board-Panel/panel.py → Blumy-Board-Panel/panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from itertools import chain

# Custom config
input = "ESPlant-Board/ESPlant-Board.kicad_pcb"
output = "ESPlant-Board-Panel/panel.kicad_pcb"
input = "Blumy-Board/Blumy-Board.kicad_pcb"
output = "Blumy-Board-Panel/panel.kicad_pcb"

# KiKit Panel Config (Only deviations from default)

Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 5e6f514

Please sign in to comment.