isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove absolute path to flock; change PATH in GH Actions

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-08-21 07:08:45 -05:00
parent a781a1f947
commit 1866743c47
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@@ -56,7 +56,9 @@ jobs:
path: uhabits-android/build/outputs/ path: uhabits-android/build/outputs/
- name: Install flock - 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 - name: Run Android Tests
run: ./build.sh android-tests ${{ matrix.api }} run: ./build.sh android-tests ${{ matrix.api }}

4
build.sh
View File

@@ -75,7 +75,7 @@ android_test() {
AVDNAME=${AVD_PREFIX}${API} AVDNAME=${AVD_PREFIX}${API}
( (
/usr/local/opt/util-linux/bin/flock 10 flock 10
log_info "Stopping Android emulator..." log_info "Stopping Android emulator..."
while [[ -n $(pgrep -f ${AVDNAME}) ]]; do while [[ -n $(pgrep -f ${AVDNAME}) ]]; do
pkill -9 -f ${AVDNAME} pkill -9 -f ${AVDNAME}
@@ -91,7 +91,7 @@ android_test() {
--package "system-images;android-$API;default;x86_64" \ --package "system-images;android-$API;default;x86_64" \
--device "Nexus 4" || return 1 --device "Nexus 4" || return 1
/usr/local/opt/util-linux/bin/flock -u 10 flock -u 10
) 10>/tmp/uhabitsTest.lock ) 10>/tmp/uhabitsTest.lock
log_info "Launching emulator..." log_info "Launching emulator..."