Skip to content

Commit ec8b466

Browse files
authored
Update main.yml
1 parent da132db commit ec8b466

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,19 @@ jobs:
9898
run: |
9999
cd android-kernel
100100
if [ ${{ github.event.inputs.android_version }} -le 12 ]; then
101-
export SKIP_MODULE_LIST_CHECK=1
102-
if [ -f "out/android${{ github.event.inputs.android_version }}-${{ github.event.inputs.kernel_version }}/common/modules.order" ]; then
103-
cp out/android${{ github.event.inputs.android_version }}-${{ github.event.inputs.kernel_version }}/common/modules.order common/android/gki_${ARCH}_modules
104-
fi
105101
BUILD_CONFIG=common/build.config.gki.${{ github.event.inputs.target_arch }} LTO=thin build/build.sh -j32
102+
OUTPUT_PATH="out/android${{ github.event.inputs.android_version }}-${{ github.event.inputs.kernel_version }}"
106103
else
107104
echo "Using Bazel build system for Android ${{ github.event.inputs.android_version }}"
108105
tools/bazel run //common:kernel_${{ github.event.inputs.target_arch }}_dist
106+
OUTPUT_PATH="out/kernel_${{ github.event.inputs.target_arch }}"
109107
fi
108+
echo "OUTPUT_PATH=$OUTPUT_PATH" >> $GITHUB_ENV
110109
continue-on-error: true
111110

112111
- name: Upload artifacts
113112
uses: actions/upload-artifact@v4.6.2
114113
with:
115114
name: kernel-driver-${{ github.event.inputs.target_arch }}
116115
path: |
117-
android-kernel/out/kernel_${{ github.event.inputs.target_arch }}
116+
android-kernel/${{ env.OUTPUT_PATH }}

0 commit comments

Comments
 (0)