Merge pull request #7 from niki-timofe/rc

Migrate to a new ufbt
niki-timofe · Apr 12, 2023 · 5a94d35 · 5a94d35
2 parents 7adcd1d + b4ade91
commit 5a94d35
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,17 +33,15 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: app
-      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
-          repository: flipperdevices/flipperzero-ufbt
-          ref: refs/heads/dev
-          path: tools
+          python-version: '3.x'
       - run: |
-          echo "$GITHUB_WORKSPACE/tools" >> $GITHUB_PATH
+          pip install ufbt
       - uses: actions/cache@v3
         id: cache-ufbt
         with:
-          path: tools/.ufbt
+          path: ~/.ufbt
           key: ${{ runner.os }}-${{ matrix.channel }}-ufbt
       - run: |
           ufbt update --channel=${{ matrix.channel }}
@@ -52,9 +50,10 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: app.${{ matrix.channel }}
+          if-no-files-found: error
           path: |
             app/dist/*.fap
-            tools/.ufbt/current/sdk_state.json
+            ~/.ufbt/current/ufbt_state.json
           
   release:
     if: startsWith(github.ref, 'refs/tags/')
@@ -65,7 +64,7 @@ jobs:
         with:
           name: app.release
       - run: |
-          echo "SDK_STATE=$(awk 1 ORS='' tools/.ufbt/current/sdk_state.json)" >> $GITHUB_ENV
+          echo "SDK_STATE=$(awk 1 ORS='' ~/.ufbt/current/ufbt_state.json)" >> $GITHUB_ENV
       - run: |
           echo "Flipper firmware version: ${{ fromJson(env.SDK_STATE).meta.version }}" >> release.txt
       - uses: softprops/action-gh-release@v1

diff --git a/onewire/onewire_worker.c b/onewire/onewire_worker.c
@@ -104,7 +104,7 @@ OneWireWorker* onewire_worker_alloc() {
 
     instance->thread = furi_thread_alloc_ex("OneWireWorker", 2048, onewire_worker_task, instance);
 
-    instance->onewire_host = onewire_host_alloc(&ibutton_gpio);
+    instance->onewire_host = onewire_host_alloc(&gpio_ibutton);
 
     onewire_worker_change_state(instance, OneWireWorkerReady);
 

diff --git a/thermometer_i.h b/thermometer_i.h
@@ -18,7 +18,7 @@
 
 #include "scenes/thermometer_scene.h"
 
-#define TM_APP_VERSION "0.1.3"
+#define TM_APP_VERSION "0.1.4"
 
 struct Thermometer {
     Gui* gui;