Merge pull request #50 from Tuchan/actions-fix

Author: 203Null

.github/workflows/buildForMystrix.yml

@@ -1,4 +1,4 @@
-name: Build for Mystrix 
+name: Build for Mystrix
 
 on:
   push:
@@ -11,58 +11,38 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout Repo
-      uses: actions/checkout@v4
-        
-    - name: Cache Git modules
-      uses: actions/cache@v4
-      with:
-        path: |
-          .git/modules  # Cache Git module data for submodules
-          lib          # Cache your submodule directories if they are in 'lib'
-          espressif/idf:release-v5.3 # ESP IDF
-        key: ${{ runner.os }}-submodules-${{ hashFiles('.gitmodules') }}
-        restore-keys: |
-          ${{ runner.os }}-submodules-
-          
-    - name: Update git submodules
-      if: steps.cache-submodule.outputs.cache-hit != 'true'
+    - name: Checkout Repository with Submodules
       uses: actions/checkout@v4
       with:
         submodules: recursive
-        
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.10'
 
-    - name: esp-idf setup
+    - name: Build Matrix OS
       uses: espressif/esp-idf-ci-action@v1
       with:
-        esp_idf_version: release-v5.3
-        path: '/'
-        target: esp32-s3
+        esp_idf_version: v5.3.1
+        target: esp32s3
+        path: '.'
         command: make DEVICE=Mystrix fullclean build-nightly uf2
-        
-    - name: Get the short commit hash
-      id: get_commit_hash
-      run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-      
-    - name: Get the current date
-      id: get_date
-      run: echo "CURRENT_DATE=$(date +'%Y-%-m-%-d')" >> $GITHUB_ENV
-      
-    - name: Rename file using date and commit hash
+
+    - name: Get Commit Info
+      id: commit_info
+      run: |
+        echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
+
+    - name: Rename UF2 File
       run: |
         OLD_FILENAME="build/Mystrix/MatrixOS-Mystrix.uf2"
         NEW_FILENAME="build/Mystrix/MatrixOS-Mystrix-nightly-${{ env.CURRENT_DATE }}-${{ env.COMMIT_HASH }}.uf2"
-        sudo mv "$OLD_FILENAME" "$NEW_FILENAME"
-        echo "Renamed $OLD_FILENAME to $NEW_FILENAME"
-          # Upload the artifact to the workflow run
-        echo "NEW_FILENAME=$NEW_FILENAME" >> $GITHUB_ENV  # Make NEW_FILENAME available in the next steps
-          
-    - name: Upload Artifact
+        sudo chown -R $(whoami):$(whoami) build/
+        sudo chmod -R 755 build/
+        cp "$OLD_FILENAME" "$NEW_FILENAME"
+        echo "NEW_FILENAME=$NEW_FILENAME" >> $GITHUB_ENV
+        echo "Renamed to: $NEW_FILENAME"
+
+    - name: Upload UF2 Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: MatrixOS-Mystrix-nightly-${{ env.CURRENT_DATE }}-${{ env.COMMIT_HASH }} # Name of the artifact
+        name: MatrixOS-Mystrix-nightly-${{ env.CURRENT_DATE }}-${{ env.COMMIT_HASH }}
         path: ${{ env.NEW_FILENAME }}
+        if-no-files-found: error

Applications/BrightnessControl/BrightnessControl.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "MatrixOS.h"
-#include "ui/UI.h"
+#include "UI/UI.h"
 
 class BrightnessControl : public UI {
  public:

Applications/BrightnessControl/UI4pxFloat.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <cmath>
-#include "ui/UI.h"
+#include "UI/UI.h"
 
 // TODO add negative support?
 // Only 4x8 support right now

Applications/Companion/Companion.h

@@ -7,7 +7,7 @@ Remember to include this header file in the UserApplications.h in the Applicatio
 
 #include "MatrixOS.h"
 #include "Application.h"
-#include "ui/UI.h"
+#include "UI/UI.h"
 
 
 class Companion : public Application {

Applications/CustomControlMap/CustomControlMap.cpp

@@ -1,5 +1,5 @@
 #include "CustomControlMap.h"
-#include "ui/UI.h"
+#include "UI/UI.h"
 
 void CustomControlMap::Setup(const vector<string>& args) {
   LoadUADfromNVS();

Applications/CustomControlMap/UILayerControl.h

@@ -1,6 +1,6 @@
 #include "MatrixOS.h"
 #include "UAD.h"
-#include "ui/UI.h"
+#include "UI/UI.h"
 
 class UILayerControl : public UIComponent {
  public:

Applications/Dice/Dice.cpp

@@ -1,5 +1,5 @@
 #include "Dice.h"
-#include "ui/UI.h"  // Include the UI Framework
+#include "UI/UI.h"  // Include the UI Framework
 
 // Run once
 void Dice::Setup(const vector<string>& args) {

Applications/Example/Example.cpp

@@ -1,5 +1,5 @@
 #include "Example.h"
-#include "ui/UI.h" // Include the UI Framework
+#include "UI/UI.h" // Include the UI Framework
 
 // Run once
 void ExampleAPP::Setup(const vector<string>& args) {

Applications/Gamepad/UIDPad.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "ui/UI.h"
+#include "UI/UI.h"
 
 class UIDPad : public UIComponent {
  public:

Applications/Gamepad/UIGamepadAxis.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "ui/UI.h"
+#include "UI/UI.h"
 
 enum GamepadAxis {
   GAMEPAD_AXIS_LEFT_X = 0,