Skip to content

Bump the actions group across 1 directory with 3 updates #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 2 commits into
base: master
Choose a base branch
from
+18 −15
Open

Bump the actions group across 1 directory with 3 updates #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
510c407
Unify logging styles of LOGD and LOGV
JingMatrix Mar 31, 2026
9fe9ffa
Bump the actions group across 1 directory with 3 updates
dependabot[bot] Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v5
uses: gradle/actions/setup-gradle@v6

- name: Configure Gradle properties
run: |
Expand All @@ -67,7 +67,7 @@ jobs:
${{ runner.os }}-ccache-

- name: Setup Android SDK
uses: android-actions/setup-android@v3
uses: android-actions/setup-android@v4

- name: Remove Android's cmake
shell: bash
Expand All @@ -87,27 +87,27 @@ jobs:
unzip zygisk/release/Vector-v*-Debug.zip -d Vector-Debug

- name: Upload zygisk release
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: ${{ steps.prepareArtifact.outputs.zygiskReleaseName }}
path: "./Vector-Release/*"

- name: Upload zygisk debug
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: ${{ steps.prepareArtifact.outputs.zygiskDebugName }}
path: "./Vector-Debug/*"

- name: Upload mappings
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: mappings
path: |
zygisk/build/outputs/mapping
app/build/outputs/mapping

- name: Upload symbols
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: symbols
path: build/symbols
Expand Down
8 changes: 6 additions & 2 deletions daemon/src/main/jni/logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@
#define LOGE(...) 0
#else
#ifndef NDEBUG
#define LOGD(fmt, ...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s:%d#%s" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__)
#define LOGV(fmt, ...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, "%s:%d#%s" ": " fmt, __FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(,) __VA_ARGS__)
#define LOGD(fmt, ...) \
__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, \
"%s:%d#%s" \
": " fmt, \
__FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
#else
#define LOGD(...) 0
#define LOGV(...) 0
Expand Down
6 changes: 3 additions & 3 deletions dex2oat/src/main/cpp/include/logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
#define LOGE(...) 0
#else
#ifndef NDEBUG
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
#define LOGV(fmt, ...) \
__android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, \
#define LOGD(fmt, ...) \
__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, \
"%s:%d#%s" \
": " fmt, \
__FILE_NAME__, __LINE__, __PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
#else
#define LOGD(...) 0
#define LOGV(...) 0
Expand Down
7 changes: 3 additions & 4 deletions native/include/common/logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,13 @@ inline void LogToAndroid(int prio, const char *tag, fmt::format_string<T...> fmt
} // namespace vector::native::detail

#ifndef NDEBUG
#define LOGV(fmt, ...) \
::vector::native::detail::LogToAndroid(ANDROID_LOG_VERBOSE, LOG_TAG, "{}:{} ({}): " fmt, \
__FILE_NAME__, __LINE__, \
__PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
#define LOGD(fmt, ...) \
::vector::native::detail::LogToAndroid(ANDROID_LOG_DEBUG, LOG_TAG, "{}:{} ({}): " fmt, \
__FILE_NAME__, __LINE__, \
__PRETTY_FUNCTION__ __VA_OPT__(, ) __VA_ARGS__)
#define LOGV(fmt, ...) \
::vector::native::detail::LogToAndroid(ANDROID_LOG_VERBOSE, LOG_TAG, \
fmt __VA_OPT__(, ) __VA_ARGS__)
#else
#define LOGV(...) ((void)0)
#define LOGD(...) ((void)0)
Expand Down
Loading