Merge branch 'main' into test/update_print_output

subosito · Nov 23, 2024 · 6db0ba8 · 6db0ba8
2 parents d7870d0 + 74af56c
commit 6db0ba8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         operating-system:
-          [ubuntu-latest, windows-latest, macos-latest, macos-13, macos-14]
+          [ubuntu-latest, windows-latest, macos-latest, macos-13]
         channel: [stable, beta, master]
         dry-run: [true, false]
         include:
@@ -72,7 +72,7 @@ jobs:
     strategy:
       matrix:
         operating-system:
-          [ubuntu-latest, windows-latest, macos-latest, macos-13, macos-14]
+          [ubuntu-latest, windows-latest, macos-latest, macos-13]
 
     steps:
       - name: Clone repository

diff --git a/setup.sh b/setup.sh
@@ -108,7 +108,7 @@ if [ -n "$VERSION_FILE" ]; then
 		exit 1
 	fi
 
-	VERSION="$(yq '.environment.flutter' "$VERSION_FILE")"
+	VERSION="$(yq eval '.environment.flutter' "$VERSION_FILE")"
 fi
 
 ARR_CHANNEL=("${@:$OPTIND:1}")
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,7 +108,7 @@ if [ -n "$VERSION_FILE" ]; then @@
     		exit 1
     	fi
-    	VERSION="$(yq '.environment.flutter' "$VERSION_FILE")"
+    	VERSION="$(yq eval '.environment.flutter' "$VERSION_FILE")"
     fi
     ARR_CHANNEL=("${@:$OPTIND:1}")
@@ Expand Down @@