Skip to content

Commit c4de3ad

Browse files
fatalcoder524fatalcoder524
committed
Test Local manifest
1 parent c52a1bf commit c4de3ad

File tree

2 files changed

+162
-148
lines changed

2 files changed

+162
-148
lines changed

‎.github/actions/action.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,15 @@ runs:
124124
125125
# Initialize and sync kernel source
126126
echo "Initializing and syncing kernel source..."
127-
$REPO init -u https://github.com/OnePlusOSS/kernel_manifest.git -b ${{ inputs.branch }} -m ${{ inputs.manifest }} --repo-rev=v2.16 --depth=1 --no-clone-bundle --no-tags
127+
if [[ "${{ inputs.manifest }}" == https://* ]]; then
128+
mkdir -p .repo/manifests
129+
curl -Ls ${{ inputs.manifest }} -o .repo/manifests/temp_manifest.xml
130+
$REPO init -u https://github.com/OnePlusOSS/kernel_manifest.git -b oneplus/sm8650 -m temp_manifest.xml --repo-rev=v2.16 --depth=1 --no-clone-bundle --no-tags
131+
else
132+
$REPO init -u https://github.com/OnePlusOSS/kernel_manifest.git -b ${{ inputs.branch }} -m ${{ inputs.manifest }} --repo-rev=v2.16 --depth=1 --no-clone-bundle --no-tags
133+
fi
134+
135+
# $REPO init -u https://github.com/OnePlusOSS/kernel_manifest.git -b ${{ inputs.branch }} -m ${{ inputs.manifest }} --repo-rev=v2.16 --depth=1 --no-clone-bundle --no-tags
128136
129137
# Sync repo and apply patches
130138
$REPO --version

‎.github/workflows/build-kernel-release.yml‎

Lines changed: 153 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -58,48 +58,54 @@ jobs:
5858
manifest: oneplus_11_v.xml
5959
android_version: android13
6060
kernel_version: "5.15"
61-
- model: OP11r
62-
soc: waipio
63-
branch: oneplus/sm8475
64-
manifest: oneplus_11r_v.xml
65-
android_version: android12
66-
kernel_version: "5.10"
67-
- model: OP-OPEN
61+
- model: OP11_l
6862
soc: kalama
6963
branch: oneplus/sm8550
70-
manifest: oneplus_open_v.xml
71-
android_version: android13
72-
kernel_version: "5.15"
73-
- model: OP-ACE-2
74-
soc: waipio
75-
branch: oneplus/sm8475
76-
manifest: oneplus_ace2_v.xml
77-
android_version: android12
78-
kernel_version: "5.10"
79-
- model: OP10t
80-
soc: waipio
81-
branch: oneplus/sm8475
82-
manifest: oneplus_10t_v.xml
83-
android_version: android12
84-
kernel_version: "5.10"
85-
- model: OP10pro
86-
soc: waipio
87-
branch: oneplus/sm8450
88-
manifest: oneplus_10_pro_v.xml
89-
android_version: android12
90-
kernel_version: "5.10"
91-
- model: OP-ACE-2-PRO
92-
soc: kalama
93-
branch: oneplus/sm8550
94-
manifest: oneplus_ace2_pro_v.xml
95-
android_version: android13
96-
kernel_version: "5.15"
97-
- model: OP12r
98-
soc: kalama
99-
branch: oneplus/sm8550
100-
manifest: oneplus_12r_v.xml
64+
manifest: https://raw.githubusercontent.com/OnePlusOSS/kernel_manifest/refs/heads/oneplus/sm8550/oneplus_11_v.xml
10165
android_version: android13
10266
kernel_version: "5.15"
67+
# - model: OP11r
68+
# soc: waipio
69+
# branch: oneplus/sm8475
70+
# manifest: oneplus_11r_v.xml
71+
# android_version: android12
72+
# kernel_version: "5.10"
73+
# - model: OP-OPEN
74+
# soc: kalama
75+
# branch: oneplus/sm8550
76+
# manifest: oneplus_open_v.xml
77+
# android_version: android13
78+
# kernel_version: "5.15"
79+
# - model: OP-ACE-2
80+
# soc: waipio
81+
# branch: oneplus/sm8475
82+
# manifest: oneplus_ace2_v.xml
83+
# android_version: android12
84+
# kernel_version: "5.10"
85+
# - model: OP10t
86+
# soc: waipio
87+
# branch: oneplus/sm8475
88+
# manifest: oneplus_10t_v.xml
89+
# android_version: android12
90+
# kernel_version: "5.10"
91+
# - model: OP10pro
92+
# soc: waipio
93+
# branch: oneplus/sm8450
94+
# manifest: oneplus_10_pro_v.xml
95+
# android_version: android12
96+
# kernel_version: "5.10"
97+
# - model: OP-ACE-2-PRO
98+
# soc: kalama
99+
# branch: oneplus/sm8550
100+
# manifest: oneplus_ace2_pro_v.xml
101+
# android_version: android13
102+
# kernel_version: "5.15"
103+
# - model: OP12r
104+
# soc: kalama
105+
# branch: oneplus/sm8550
106+
# manifest: oneplus_12r_v.xml
107+
# android_version: android13
108+
# kernel_version: "5.15"
103109
runs-on: ubuntu-latest
104110
steps:
105111
- name: Select Appropriate SusFS Branch
@@ -153,124 +159,124 @@ jobs:
153159
ksun_branch: ${{ inputs.ksun_branch }}
154160
susfs_branch: ${{ steps.get-susfs-branch.outputs.susfs_branch }}
155161

156-
build-batch-2:
157-
# needs: build-batch-1
158-
name: build-batch-2 (${{ matrix.model }}, ${{ matrix.soc }}, ${{ matrix.branch }}, ${{ matrix.manifest }}, ${{ matrix.android_version }}, ${{ matrix.kernel_version }}, ${{ inputs.ksun_branch }})
159-
strategy:
160-
fail-fast: false
161-
matrix:
162-
include:
163-
- model: OP13
164-
soc: sun
165-
branch: oneplus/sm8750
166-
manifest: oneplus_13.xml
167-
android_version: android15
168-
kernel_version: "6.6"
169-
- model: OPAce5Pro
170-
soc: sun
171-
branch: oneplus/sm8750
172-
manifest: oneplus_ace5_pro.xml
173-
android_version: android15
174-
kernel_version: "6.6"
175-
- model: OP12
176-
soc: pineapple
177-
branch: oneplus/sm8650
178-
manifest: oneplus12_v.xml
179-
android_version: android14
180-
kernel_version: "6.1"
181-
- model: OP13r
182-
soc: pineapple
183-
branch: oneplus/sm8650
184-
manifest: oneplus_13r.xml
185-
android_version: android14
186-
kernel_version: "6.1"
187-
- model: OP-ACE-5
188-
soc: pineapple
189-
branch: oneplus/sm8650
190-
manifest: oneplus_ace5.xml
191-
android_version: android14
192-
kernel_version: "6.1"
193-
- model: OP-ACE-3V
194-
soc: pineapple
195-
branch: oneplus/sm7675
196-
manifest: oneplus_ace_3v_v.xml
197-
android_version: android14
198-
kernel_version: "6.1"
199-
- model: OP-NORD-4
200-
soc: pineapple
201-
branch: oneplus/sm7675
202-
manifest: oneplus_nord_4_v.xml
203-
android_version: android14
204-
kernel_version: "6.1"
205-
- model: OP-PAD-2
206-
soc: pineapple
207-
branch: oneplus/sm8650
208-
manifest: oneplus_pad2_v.xml
209-
android_version: android14
210-
kernel_version: "6.1"
211-
- model: OP13S
212-
soc: sun
213-
branch: oneplus/sm8750
214-
manifest: oneplus_13s.xml
215-
android_version: android15
216-
kernel_version: "6.6"
217-
runs-on: ubuntu-latest
218-
steps:
219-
- name: Select Appropriate SusFS Branch
220-
id: get-susfs-branch
221-
run: |
222-
KERNEL_STRING="${{ matrix.android_version }}-${{ matrix.kernel_version }}"
162+
# build-batch-2:
163+
# # needs: build-batch-1
164+
# name: build-batch-2 (${{ matrix.model }}, ${{ matrix.soc }}, ${{ matrix.branch }}, ${{ matrix.manifest }}, ${{ matrix.android_version }}, ${{ matrix.kernel_version }}, ${{ inputs.ksun_branch }})
165+
# strategy:
166+
# fail-fast: false
167+
# matrix:
168+
# include:
169+
# - model: OP13
170+
# soc: sun
171+
# branch: oneplus/sm8750
172+
# manifest: oneplus_13.xml
173+
# android_version: android15
174+
# kernel_version: "6.6"
175+
# - model: OPAce5Pro
176+
# soc: sun
177+
# branch: oneplus/sm8750
178+
# manifest: oneplus_ace5_pro.xml
179+
# android_version: android15
180+
# kernel_version: "6.6"
181+
# - model: OP12
182+
# soc: pineapple
183+
# branch: oneplus/sm8650
184+
# manifest: oneplus12_v.xml
185+
# android_version: android14
186+
# kernel_version: "6.1"
187+
# - model: OP13r
188+
# soc: pineapple
189+
# branch: oneplus/sm8650
190+
# manifest: oneplus_13r.xml
191+
# android_version: android14
192+
# kernel_version: "6.1"
193+
# - model: OP-ACE-5
194+
# soc: pineapple
195+
# branch: oneplus/sm8650
196+
# manifest: oneplus_ace5.xml
197+
# android_version: android14
198+
# kernel_version: "6.1"
199+
# - model: OP-ACE-3V
200+
# soc: pineapple
201+
# branch: oneplus/sm7675
202+
# manifest: oneplus_ace_3v_v.xml
203+
# android_version: android14
204+
# kernel_version: "6.1"
205+
# - model: OP-NORD-4
206+
# soc: pineapple
207+
# branch: oneplus/sm7675
208+
# manifest: oneplus_nord_4_v.xml
209+
# android_version: android14
210+
# kernel_version: "6.1"
211+
# - model: OP-PAD-2
212+
# soc: pineapple
213+
# branch: oneplus/sm8650
214+
# manifest: oneplus_pad2_v.xml
215+
# android_version: android14
216+
# kernel_version: "6.1"
217+
# - model: OP13S
218+
# soc: sun
219+
# branch: oneplus/sm8750
220+
# manifest: oneplus_13s.xml
221+
# android_version: android15
222+
# kernel_version: "6.6"
223+
# runs-on: ubuntu-latest
224+
# steps:
225+
# - name: Select Appropriate SusFS Branch
226+
# id: get-susfs-branch
227+
# run: |
228+
# KERNEL_STRING="${{ matrix.android_version }}-${{ matrix.kernel_version }}"
223229

224-
case "$KERNEL_STRING" in
225-
"android12-5.10")
226-
SUSFS_BRANCH="${{ inputs.android12-5_10_susfs_branch }}"
227-
;;
228-
"android13-5.10")
229-
SUSFS_BRANCH="${{ inputs.android13-5_10_susfs_branch }}"
230-
;;
231-
"android13-5.15")
232-
SUSFS_BRANCH="${{ inputs.android13-5_15_susfs_branch }}"
233-
;;
234-
"android14-5.15")
235-
SUSFS_BRANCH="${{ inputs.android14-5_15_susfs_branch }}"
236-
;;
237-
"android14-6.1")
238-
SUSFS_BRANCH="${{ inputs.android14-6_1_susfs_branch }}"
239-
;;
240-
"android15-6.6")
241-
SUSFS_BRANCH="${{ inputs.android15-6_6_susfs_branch }}"
242-
;;
243-
*)
244-
echo "Invalid kernel version or unsupported: $KERNEL_STRING"
245-
exit 1
246-
;;
247-
esac
230+
# case "$KERNEL_STRING" in
231+
# "android12-5.10")
232+
# SUSFS_BRANCH="${{ inputs.android12-5_10_susfs_branch }}"
233+
# ;;
234+
# "android13-5.10")
235+
# SUSFS_BRANCH="${{ inputs.android13-5_10_susfs_branch }}"
236+
# ;;
237+
# "android13-5.15")
238+
# SUSFS_BRANCH="${{ inputs.android13-5_15_susfs_branch }}"
239+
# ;;
240+
# "android14-5.15")
241+
# SUSFS_BRANCH="${{ inputs.android14-5_15_susfs_branch }}"
242+
# ;;
243+
# "android14-6.1")
244+
# SUSFS_BRANCH="${{ inputs.android14-6_1_susfs_branch }}"
245+
# ;;
246+
# "android15-6.6")
247+
# SUSFS_BRANCH="${{ inputs.android15-6_6_susfs_branch }}"
248+
# ;;
249+
# *)
250+
# echo "Invalid kernel version or unsupported: $KERNEL_STRING"
251+
# exit 1
252+
# ;;
253+
# esac
248254

249-
if [[ -z "$SUSFS_BRANCH" ]]; then
250-
SUSFS_BRANCH="gki-${{ matrix.android_version }}-${{ matrix.kernel_version }}"
251-
fi
255+
# if [[ -z "$SUSFS_BRANCH" ]]; then
256+
# SUSFS_BRANCH="gki-${{ matrix.android_version }}-${{ matrix.kernel_version }}"
257+
# fi
252258

253-
echo "susfs_branch=$SUSFS_BRANCH" >> $GITHUB_OUTPUT
259+
# echo "susfs_branch=$SUSFS_BRANCH" >> $GITHUB_OUTPUT
254260

255-
- name: Checkout Code
256-
uses: actions/checkout@v3
261+
# - name: Checkout Code
262+
# uses: actions/checkout@v3
257263

258-
- name: Build Kernel
259-
uses: ./.github/actions
260-
with:
261-
model: ${{ matrix.model }}
262-
soc: ${{ matrix.soc }}
263-
branch: ${{ matrix.branch }}
264-
manifest: ${{ matrix.manifest }}
265-
android_version: ${{ matrix.android_version }}
266-
kernel_version: ${{ matrix.kernel_version }}
267-
ksun_branch: ${{ inputs.ksun_branch }}
268-
susfs_branch: ${{ steps.get-susfs-branch.outputs.susfs_branch }}
264+
# - name: Build Kernel
265+
# uses: ./.github/actions
266+
# with:
267+
# model: ${{ matrix.model }}
268+
# soc: ${{ matrix.soc }}
269+
# branch: ${{ matrix.branch }}
270+
# manifest: ${{ matrix.manifest }}
271+
# android_version: ${{ matrix.android_version }}
272+
# kernel_version: ${{ matrix.kernel_version }}
273+
# ksun_branch: ${{ inputs.ksun_branch }}
274+
# susfs_branch: ${{ steps.get-susfs-branch.outputs.susfs_branch }}
269275

270276
trigger-release:
271277
needs:
272278
- build-batch-1
273-
- build-batch-2
279+
# - build-batch-2
274280
runs-on: ubuntu-latest
275281
if: ${{ inputs.make_release }}
276282
env:

0 commit comments

Comments
 (0)