Skip to content

Commit

Permalink
misc: little compile fix + add android branch to Makefile CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Toni500github committed Dec 5, 2024
1 parent a8a3737 commit 1cda3c4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Makefile CI (Test customfetch NOGUI)

on:
push:
branches: [ "main", "test", "windows" ]
branches: [ "main", "test", "android" ]
pull_request:
branches: [ "main", "test", "windows" ]
branches: [ "main", "test", "android" ]

jobs:
build-deb:
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ clean:
rm -rf $(BUILDDIR)/$(TARGET) $(BUILDDIR)/libcustomfetch.a $(OBJ)

distclean:
./android/gradlew clean --project-dir=./android
rm -rf $(BUILDDIR) ./tests/$(BUILDDIR) $(OBJ)
find . -type f -name "*.tar.gz" -exec rm -rf "{}" \;
find . -type f -name "*.o" -exec rm -rf "{}" \;
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ system
// clang-format off
// parseargs() but only for parsing the user config path trough args
// and so we can directly construct Config
static STRING_IF_ANDROID_APP_ELSE(bool) parse_config_path(int argc, char* argv[], const std::string& configDir)
static std::string parse_config_path(int argc, char* argv[], const std::string& configDir)
{
int opt = 0;
int option_index = 0;
Expand Down Expand Up @@ -638,4 +638,4 @@ int main(int argc, char *argv[])
#endif // !ANDROID_APP

return _false; // 0 or "false"
}
}

0 comments on commit 1cda3c4

Please sign in to comment.