Skip to content

Commit

Permalink
Merge branch 'josephdadams:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
NoahCallaway authored Nov 6, 2021
2 parents aa41b7b + 90b8b73 commit 1aff71f
Show file tree
Hide file tree
Showing 52 changed files with 10,481 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SENTRY_ENABLED=0
SENTRY_DSN="https://[email protected]/0"
183 changes: 183 additions & 0 deletions .github/workflows/build-listener-clients.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
name: Build Listener Clients

on: [push, workflow_dispatch]

jobs:
build_m5stickc-listener:
name: Build M5StickC Listener
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: arduino/compile-sketches@v1
with:
platforms: |
- name: esp32:esp32
source-url: https://dl.espressif.com/dl/package_esp32_index.json
fqbn: 'esp32:esp32:m5stick-c'
libraries: |
- source-url: https://github.com/m5stack/M5StickC/archive/refs/tags/0.2.4.zip
- source-url: https://github.com/m5stack/M5StickC-Plus/archive/refs/tags/0.0.4.zip
- name: WebSockets
- name: WiFiManager
- name: MultiButton
- name: Arduino_JSON
cli-compile-flags: |
- --export-binaries
sketch-paths: |
- listener_clients/m5stickc-listener
enable-deltas-report: true
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: 'TallyArbiter-Listener-M5StickC'
path: 'listener_clients/m5stickc-listener/build/esp32.esp32.m5stick-c'

build_m5atom-listener:
name: Build M5Atom Listener
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: arduino/compile-sketches@v1
with:
platforms: |
- name: esp32:esp32
source-url: https://dl.espressif.com/dl/package_esp32_index.json
fqbn: 'esp32:esp32:m5stack-atom'
libraries: |
- source-url: https://github.com/m5stack/M5Atom/archive/refs/tags/0.0.6.zip
- name: WebSockets
- name: WiFiManager
- name: MultiButton
- name: Arduino_JSON
- name: FastLED
cli-compile-flags: |
- --export-binaries
sketch-paths: |
- listener_clients/M5AtomMatrix-listener/tallyarbiter-m5atom
enable-deltas-report: true
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: 'TallyArbiter-Listener-M5Atom'
path: 'listener_clients/M5AtomMatrix-listener/tallyarbiter-m5atom/build/esp32.esp32.m5stack-atom'

build_esp32-neopixel-listener:
name: Build ESP32 NeoPixel Listener
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: arduino/compile-sketches@v1
with:
platforms: |
- name: esp32:esp32
source-url: https://dl.espressif.com/dl/package_esp32_index.json
fqbn: 'esp32:esp32:esp32'
libraries: |
- name: WebSockets
- name: WiFiManager
- name: MultiButton
- name: Arduino_JSON
- name: Adafruit NeoPixel
cli-compile-flags: |
- --export-binaries
sketch-paths: |
- listener_clients/esp32-neopixel-listener
enable-deltas-report: true
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: 'TallyArbiter-Listener-ESP32-NeoPixel'
path: 'listener_clients/esp32-neopixel-listener/build/esp32.esp32.esp32'

build_TTGO-listener:
strategy:
fail-fast: false
matrix:
board:
- fqbn: esp32:esp32:ttgo-t1
name: TTGO T1
- fqbn: esp32:esp32:ttgo-t7-v13-mini32
name: TTGO T7 v13 Mini32
- fqbn: esp32:esp32:ttgo-t7-v14-mini32
name: TTGO T7 v14 Mini32
- fqbn: esp32:esp32:twatch
name: TTGO T-Watch
name: Build ${{ matrix.board.name }} Listener
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: arduino/compile-sketches@v1
with:
platforms: |
- name: esp32:esp32
source-url: https://dl.espressif.com/dl/package_esp32_index.json
fqbn: ${{ matrix.board.fqbn }}
libraries: |
- name: WebSockets
- name: WiFiManager
- name: MultiButton
- name: Arduino_JSON
- name: TFT_eSPI
cli-compile-flags: |
- --export-binaries
sketch-paths: |
- listener_clients/TTGO_T-listener
enable-deltas-report: true
- name: Get FQBN build dir for ${{ matrix.board.name }}
run: |
RAW_FQBN="${{ matrix.board.fqbn }}"
FQBN_REPLACED=$(echo $RAW_FQBN | sed 's/:/./g')
echo "FQBN_REPLACED=$FQBN_REPLACED" >> $GITHUB_ENV
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: 'TallyArbiter-Listener-${{ matrix.board.name }}'
path: 'listener_clients/TTGO_T-listener/build/${{ env.FQBN_REPLACED }}'

analyse_blink1-listener:
name: Analyse Blink1 Listener
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install prosepector
run: pip install prospector[with_everything]
- name: Analyse
working-directory: listener_clients/blink1-listener
run: prospector -W pyroma -0

analyse_blinkt-listener:
name: Analyse Pimoroni Blinkt Listener
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install prosepector
run: pip install prospector[with_everything]
- name: Analyse
working-directory: listener_clients/pimoroni-blinkt-listener
run: prospector -W pyroma -0

analyse_gpo-listener:
name: Analyse GPO Listener
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install prosepector
run: pip install prospector[with_everything]
- name: Analyse
working-directory: listener_clients/gpo-listener
run: prospector -W pyroma -0

analyse_relay-listener:
name: Analyse Relay Listener
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install dependencies
working-directory: listener_clients/relay-listener
run: |
sudo apt install libudev-dev libusb-1.0-0 libusb-1.0-0-dev
npm install
npm install --global eslint
- name: Run eslint
working-directory: listener_clients/relay-listener
run: eslint index.js || exit 0
15 changes: 15 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ jobs:
node-version: 14
- name: Install dependencies
run: npm i
- name: Create env file
run: |
touch .env
echo SENTRY_ENABLED=1 >> .env
echo SENTRY_DSN=${{ secrets.SENTRY_DSN }} >> .env
- name: Build
run: npm pack
- name: NPM Publish
Expand Down Expand Up @@ -65,6 +70,11 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Create env file
run: |
touch .env
echo SENTRY_ENABLED=1 >> .env
echo SENTRY_DSN=${{ secrets.SENTRY_DSN }} >> .env
- name: Build and push
if: startsWith(github.ref, 'refs/tags/v') != true
uses: docker/build-push-action@v2
Expand Down Expand Up @@ -96,6 +106,11 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: 14
- name: Create env file
run: |
touch .env
echo SENTRY_ENABLED=1 >> .env
echo SENTRY_DSN=${{ secrets.SENTRY_DSN }} >> .env
- name: Install dependencies and build
run: npm i; npm run build
- name: Build
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/welcome-first-time-contributor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Welcome first time contributors

on:
pull_request_target:
types:
- opened
issues:
types:
- opened

jobs:
welcome:
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: |
Hello there ${{ github.actor }} 👋
Welcome to TallyArbiter!! 💖🥳
Thank you and congratulations 🎉 for opening your very first issue in this project. TallyArbiter fosters an open and welcoming environment for all our contributors.🌸 Please adhere to our [Code Of Conduct](https://github.com/josephdadams/TallyArbiter/blob/master/CODE_OF_CONDUCT.md).
Incase you want to claim this issue, please comment down below! We will try to get back to you as soon as we can.👀
Feel free to contact the author or for any other information, please visit [www.techministry.blog](www.techministry.blog). 👩‍💻 We would love to hear your interesting ideas and engage in discussions.💖
pr-message: |
Hello there ${{ github.actor }} 👋
Thank you and congrats 🎉 for opening your first PR on this project.✨
We will review it soon!
TallyArbiter fosters an open and welcoming environment for all our contributors.🌸 Please adhere to our [Code Of Conduct](https://github.com/josephdadams/TallyArbiter/blob/master/CODE_OF_CONDUCT.md).
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ dist
.fusebox/

# DynamoDB Local files
.dynamodb/
./

# TernJS port file
.tern-port
Expand All @@ -119,9 +119,19 @@ UI/src/app/_models
# don't include UI versions.ts file
UI/src/environments/versions.ts

# don't include any installers
# don't include any installer
release

#listener clients configs
deviceid.txt
config.ini
config_gpo.json
config_relays.json
*.bin
*.elf
*.hex
*.hex.bin

# don't include .DS_Store file and vscode workspace file
.DS_Store
TallyArbiter.code-workspace
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team by filing an issue on the Github repository.
All complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
17 changes: 17 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Security Policy

## Supported Versions

The following versions of Tally Arbiter are currently being supported with security updates:

| Version | Supported |
| ------- | ------------------ |
| 3.0.x | :white_check_mark: |
| < 3.0.x | :x: |

## Reporting a Vulnerability

To report a vulnerability, please file an issue request [here](http://github.com/josephdadams/tallyarbiter/issues/new).

We take all security issues seriously and will try to issue a hotfix as soon as possible. This project is very community-friendly, so if you know how to fix it, please file a pull request yourself!
Go check out our [Code of Conduct](https://github.com/josephdadams/TallyArbiter/blob/master/CODE_OF_CONDUCT.md) and get started.
Loading

0 comments on commit 1aff71f

Please sign in to comment.