Skip to content

Commit

Permalink
squash
Browse files Browse the repository at this point in the history
  • Loading branch information
rusefillc authored and rusefillc committed Dec 4, 2023
1 parent 693bd38 commit b742eb5
Show file tree
Hide file tree
Showing 9 changed files with 178 additions and 25 deletions.
134 changes: 134 additions & 0 deletions .github/workflows/build-firmware-explicit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
name: Firmware at GHA

on:
push:
pull_request:
workflow_dispatch:

jobs:
build-firmware:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

# Build machines don't have arm-none-eabi gcc, so let's download it and put it on the path
- name: Download & Install GCC
if: ${{ env.skip != 'true' }}
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
run: |
ext/rusefi/firmware/provide_gcc.sh
echo "::add-path::`pwd`/gcc-arm-none-eabi/bin"
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11'

- name: Test Compiler
run: javac -version

- name: Install Tools
run: |
sudo bash ext/rusefi/misc/actions/add-ubuntu-latest-apt-mirrors.sh
sudo apt-get install sshpass sshpass mtools
- name: Removing other .ini files since we will be uploading
working-directory: ext/rusefi/
run: rm -rf firmware/tunerstudio/generated/*.ini

- name: Gen Config
working-directory: ext/rusefi/firmware
run: |
bash gen_config_board.sh ../../.. paralela
- name: Config Status
working-directory: ext/rusefi
run: |
git status
- name: Push Config
run: |
mkdir -p generated
cp ext/rusefi/firmware/controllers/generated/rusefi_generated.h generated
cp ext/rusefi/firmware/controllers/generated/signature_paralela.h generated
cp ext/rusefi/firmware/tunerstudio/generated/rusefi_paralela.ini generated
git config --local user.email "[email protected]"
git config --local user.name "GitHub git update Action"
git add generated/*
git commit -am "GHA Automation Snapshot just for reference"
git status
- name: Connectors Status
run: |
git status
- name: Push Connectors
run: |
git add connectors/*
OUT=$(git commit -am "GHA Connectors Generated" 2>&1) || echo "commit failed, finding out why"
if echo "$OUT" | grep 'nothing to commit'; then
echo "Connectors: looks like nothing to commit"
exit 0
fi
- name: Push
uses: ad-m/github-push-action@master
with:
github_token: ${{ github.token }}

- name: Upload .ini files to server
working-directory: ext/rusefi/firmware/tunerstudio/generated
run: ../upload_ini.sh rusefi_paralela.ini ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}

- name: Build Firmware
working-directory: ext/rusefi
run: bash misc/jenkins/compile_other_versions/compile.sh ../../.. paralela

- name: Upload build bin artifact
uses: actions/upload-artifact@v3
with:
name: rusefi.bin
path: ext/rusefi/firmware/deliver/rusefi*.bin

- name: Upload build hex artifact
uses: actions/upload-artifact@v3
with:
name: rusefi.hex
path: ext/rusefi/firmware/deliver/rusefi*.hex

- name: Upload build map artifact
uses: actions/upload-artifact@v3
with:
name: rusefi.map
path: ext/rusefi/firmware/deliver/rusefi*.map

- name: Build console
working-directory: ext/rusefi/
run: bash misc/jenkins/build_java_console.sh

- name: Set SSH variables
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
run: |
if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then
echo "Setting credentials..."
echo "RUSEFI_SSH_SERVER=${{secrets.RUSEFI_SSH_SERVER}}" >> $GITHUB_ENV
echo "RUSEFI_SSH_USER=${{secrets.RUSEFI_SSH_USER}}" >> $GITHUB_ENV
echo "RUSEFI_SSH_PASS=${{secrets.RUSEFI_SSH_PASS}}" >> $GITHUB_ENV
else
echo "NOT setting credentials: ${{github.event_name}} ${{github.ref}}"
fi
- name: Package and Upload Bundle
working-directory: ext/rusefi/
run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh paralela rusefi_paralela.ini master

- name: Upload bundle artifact
uses: actions/upload-artifact@v3
with:
name: rusefi_bundle_paralela.zip
path: ext/rusefi/artifacts/rusefi_bundle*.zip
35 changes: 13 additions & 22 deletions .github/workflows/build-firmware.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
name: Firmware at GHA
name: Create Board Firmware

on: [ push, pull_request ]
on:
# push:
# pull_request:
workflow_dispatch:

jobs:
build-firmware:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

# Build machines don't have arm-none-eabi gcc, so let's download it and put it on the path
- name: Download & Install GCC
if: ${{ env.skip != 'true' }}
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
run: |
ext/rusefi/firmware/provide_gcc.sh
echo "::add-path::`pwd`/gcc-arm-none-eabi/bin"
- name: 1. Compile
run: |
bash compile.sh
# call-workflow-passing-data:
# uses: rusefi/rusefi/.github/workflows/custom-board-build.yaml@master
# secrets: inherit
# permissions:
# contents: write
# with:
# shortBoardName: paralela
# iniFileName: rusefi_paralela.ini
10 changes: 10 additions & 0 deletions .github/workflows/update-rusefi-reference.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Update rusEFI Reference

on:
workflow_dispatch:

jobs:
call-workflow-passing-data:
uses: rusefi/rusefi/.github/workflows/custom-board-update-rusefi-reference.yaml@master
permissions:
contents: write
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# fw-Paralela

OMG a custom rusEFI firmware! Claim your bundle at https://rusefi.com/build_server/rusefi_bundle_paralela.zip
5 changes: 4 additions & 1 deletion board.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp

DDEFS += -DFIRMWARE_ID=\"Paralela\"
SHORT_BOARD_NAME=paralela


# assign critical LED to a non-existent pin
DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::I15
13 changes: 13 additions & 0 deletions board_configuration.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include "pch.h"

Gpio getCommsLedPin() {
return Gpio::D15;
}

Gpio getRunningLedPin() {
return Gpio::Unassigned;
}

Gpio getWarningLedPin() {
return Gpio::Unassigned;
}
File renamed without changes.
1 change: 1 addition & 0 deletions connectors/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
See https://github.com/chuckwagoncomputing/interactive-pinout for documentation
2 changes: 0 additions & 2 deletions signature_paralela.h

This file was deleted.

0 comments on commit b742eb5

Please sign in to comment.