Bob Matcuk 1 год назад
Родитель
Сommit
0df68c3c34

+ 2 - 2
.github/workflows/check-for-new-firmware.yml

@@ -13,14 +13,14 @@ jobs:
       version: ${{ steps.check.outputs.version }}
     steps:
       - name: Checkout Flipper Zero Firmware
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'flipperdevices/flipperzero-firmware'
           fetch-depth: 0
           # we don't need submodules yet - fbt will get them if we build
           # submodules: true
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: 'applications_user/qrcode_app'
           token: ${{ secrets.CustomGithubToken }}

+ 3 - 3
.github/workflows/release.yml

@@ -14,19 +14,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Flipper Zero Firmware
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'flipperdevices/flipperzero-firmware'
           ref: ${{ env.firmware_version }}
           submodules: true
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: 'applications_user/qrcode_app'
       - name: Build
         run: ./fbt fap_qrcode
       - name: Publish
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: build/f7-firmware-D/.extapps/qrcode.fap
           body: Built against firmware v${{ env.firmware_version }}

+ 2 - 2
scripts/check-firmware.sh

@@ -14,7 +14,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd -P)"
 FIRMWARE_DIR="$1"
 
 LASTVER="$(git -C "$SCRIPT_DIR" tag | grep firmware-v | sort -V | tail -n1 | sed -e 's/^firmware-v//')"
-print_status notice "last built against firmware version: $LASTVER"
+print_status notice "last built against firmware version: '$LASTVER'"
 
 VER="$(git -C "$FIRMWARE_DIR" tag | sed -E -e '/^[0-9]+\.[0-9]+\.[0-9]+$/!d' | sort -V | sed -e "1,/$LASTVER/d" | tail -n1)"
 # VER="$(curl https://api.github.com/repos/flipperdevices/flipperzero-firmware/tags | jq -r --arg current "$LASTVER" 'def ver($v): $v | ltrimstr("v") | split(".") | map(tonumber); map(.name) | map(select(. | test("^\\d+\\.\\d+\\.\\d+$";"s"))) | map(ver(.)) | map(select(. > ver($current))) | sort | last | if . == null then "" else join(".") end')"
@@ -22,5 +22,5 @@ if [ -z "$VER" ]; then
   print_status notice "no new firmware version"
   exit 0
 fi
-print_status notice "new firmware version: $VER"
+print_status notice "new firmware version: '$VER'"
 echo "version=$VER" >> $GITHUB_OUTPUT