Fixes depends libraries and cosmetic change

m5stack · Oct 17, 2024 · 31a8307 · 31a8307
1 parent f596656
commit 31a8307
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 64 deletions.
diff --git a/.github/workflows/ArduinoBuild_2.yml b/.github/workflows/ArduinoBuild_2.yml
@@ -2,9 +2,7 @@ name: ArduinoBuild(platform-version 2.x)
 
 env:
   SKETCH_NAMES_FIND_START: ./examples/UnitUnified
-  REQUIRED_LIBRARIES: M5Unified
-  M5UNITUNIFIED_BRANCH: main
-#  M5UNITUNIFIED_BRANCH: develop
+  REQUIRED_LIBRARIES: M5Unified,M5UnitUnified
 
 on:
   push:
@@ -88,33 +86,6 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      # Checkout library from specific URL and branch
-      # Note that dependent libraries are not automatically installed.
-
-      - name: Checkout M5Utility
-        uses: actions/checkout@v4
-        with:
-          repository: m5stack/M5Utility
-          ref: ${{ env.M5UNITUNIFIED_BRANCH }}
-          path: CustomLibrary_M5Utility # must contain string "Custom"
-          #token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
-
-      - name: Checkout M5HAL
-        uses: actions/checkout@v4
-        with:
-          repository: m5stack/M5HAL
-          ref: ${{ env.M5UNITUNIFIED_BRANCH }}
-          path: CustomLibrary_M5HAL # must contain string "Custom"
-          #token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
-
-      - name: Checkout M5UnitUnified
-        uses: actions/checkout@v4
-        with:
-          repository: m5stack/M5UnitUnified
-          ref: ${{ env.M5UNITUNIFIED_BRANCH }}
-          path: CustomLibrary_M5UnitUnified
-          #token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
-
       # Build 
       - name: Compile examples
         uses: ArminJo/arduino-test-compile@master

diff --git a/.github/workflows/ArduinoBuild_3.yml b/.github/workflows/ArduinoBuild_3.yml
@@ -2,9 +2,7 @@ name: ArduinoBuild(platform-version 3.x)
 
 env:
   SKETCH_NAMES_FIND_START: ./examples/UnitUnified
-  REQUIRED_LIBRARIES: M5Unified
-  M5UNITUNIFIED_BRANCH: main
-#  M5UNITUNIFIED_BRANCH: develop
+  REQUIRED_LIBRARIES: M5Unified,M5UnitUnified
 
 on:
   push:
@@ -94,33 +92,6 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      # Checkout library from specific URL and branch
-      # Note that dependent libraries are not automatically installed.
-
-      - name: Checkout M5Utility
-        uses: actions/checkout@v4
-        with:
-          repository: m5stack/M5Utility
-          ref: ${{ env.M5UNITUNIFIED_BRANCH }}
-          path: CustomLibrary_M5Utility # must contain string "Custom"
-          #token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
-
-      - name: Checkout M5HAL
-        uses: actions/checkout@v4
-        with:
-          repository: m5stack/M5HAL
-          ref: ${{ env.M5UNITUNIFIED_BRANCH }}
-          path: CustomLibrary_M5HAL # must contain string "Custom"
-          #token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
-
-      - name: Checkout M5UnitUnified
-        uses: actions/checkout@v4
-        with:
-          repository: m5stack/M5UnitUnified
-          ref: ${{ env.M5UNITUNIFIED_BRANCH }}
-          path: CustomLibrary_M5UnitUnified
-          #token: ${{ secrets.TOKEN_M5UNITUNIFIED }} # Only required during development in private repo
-
       # Build 
       - name: Compile examples
         uses: ArminJo/arduino-test-compile@master

diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml
@@ -115,10 +115,6 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-#      - name: Configure git for authentication (Until each repository is published)
-#        run: |
-#          git config --global url."https://${{ secrets.TOKEN_M5UNITUNIFIED }}@github.com/".insteadOf "https://github.com/"
-
       - name: Build examples
         uses: karniv00l/platformio-run-action@v1
         with: