diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b4fc54f6..012019cdb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -56,7 +56,9 @@ jobs: path: uhabits-android/build/outputs/ - name: Install flock - run: brew install util-linux + run: | + brew install util-linux + echo "/usr/local/opt/util-linux/bin" >> $GITHUB_PATH - name: Run Android Tests run: ./build.sh android-tests ${{ matrix.api }} diff --git a/build.sh b/build.sh index d1de400ed..b865429de 100755 --- a/build.sh +++ b/build.sh @@ -75,7 +75,7 @@ android_test() { AVDNAME=${AVD_PREFIX}${API} ( - /usr/local/opt/util-linux/bin/flock 10 + flock 10 log_info "Stopping Android emulator..." while [[ -n $(pgrep -f ${AVDNAME}) ]]; do pkill -9 -f ${AVDNAME} @@ -91,7 +91,7 @@ android_test() { --package "system-images;android-$API;default;x86_64" \ --device "Nexus 4" || return 1 - /usr/local/opt/util-linux/bin/flock -u 10 + flock -u 10 ) 10>/tmp/uhabitsTest.lock log_info "Launching emulator..."