Skip to content

Commit 015e47d

Browse files
authored
Merge pull request #3 from easterNday/main
Fix: Make thyme's Recovery available for normal use after compilation
2 parents f782427 + 4aadebc commit 015e47d

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

.github/workflows/twrp.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@ on:
1010

1111
jobs:
1212
Read-configuration:
13-
name: 🏧 Parse *.config.json
13+
name: ®️ Parse *.config.json
1414
runs-on: ubuntu-latest
1515
outputs:
1616
CONFIGS: ${{ steps.generate-matrix.outputs.CONFIGS }}
1717
BUILD_DATE: ${{ steps.generate-builddate.outputs.BUILDDATE }}
1818
steps:
1919
# This action checks-out your CONFIGSitory under $GITHUB_WORKSPACE, so your workflow can access it.
20-
- name: Checkout
20+
- name: 🔴 Checkout
2121
uses: actions/checkout@v4
2222

2323
# Match the configuration files in the CONFIGS directory, read the contents and merge them into an array.
24-
- name: Generate Matrix
24+
- name: 🟠 Generate Matrix
2525
id: generate-matrix
2626
run: |
2727
echo "CONFIGS<<EOF" >> $GITHUB_OUTPUT
2828
jq -s '[.[][]]' TWRP/configs/*.config.json >> $GITHUB_OUTPUT
2929
echo "EOF" >> $GITHUB_OUTPUT
3030
3131
# Set compile time.
32-
- name: Set builddate
32+
- name: 🟡 Set builddate
3333
id: generate-builddate
3434
run: echo "BUILDDATE=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
3535

3636
Build-TWRP:
37-
name: 🛄 Build TWRP
37+
name: ©️ Build TWRP
3838
runs-on: ubuntu-latest
3939
needs:
4040
- Read-configuration
@@ -66,48 +66,49 @@ jobs:
6666
CCACHE_DIR: "${{ github.workspace }}/ccache"
6767
steps:
6868
# Clean up the workspace and make room for compilation
69-
- name: Cleanup
69+
- name: Cleanup
7070
uses: rokibhasansagar/slimhub_actions@main
71+
with:
72+
retain: "java_tools,android_sdk"
7173

72-
- name: Prepare the build environment
74+
- name: Prepare the build environment
7375
run: |
7476
cd ~
77+
sudo apt update -y
7578
sudo apt install git aria2 -y
7679
git clone https://gitlab.com/OrangeFox/misc/scripts
7780
cd scripts
7881
sudo bash setup/android_build_env.sh
7982
sed -i 's/cd -/cd ../g' setup/install_android_sdk.sh
8083
sudo bash setup/install_android_sdk.sh
8184
82-
- name: Sync OrangeFox sources and minimal manifest
85+
- name: Sync OrangeFox sources and minimal manifest
8386
run: |
8487
git clone ${{ env.OF_SYNC_REPO }} sync
8588
cd sync
8689
./orangefox_sync.sh --branch ${{ env.OF_SYNC_BRANCH }} --path ${{ env.OF_LOCATION }}
8790
88-
- name: Place device trees and kernel
91+
- name: Place device trees and kernel
8992
working-directory: ${{ env.OF_LOCATION }}
9093
run: |
9194
git clone --recursive --depth=1 -j $(nproc) --branch ${{ env.DEVICE_BRANCH }} ${{ env.DEVICE_REPO }} ${{ env.DEVICE_LOCATION }}
9295
93-
- name: Set Swap Space
96+
- name: Set Swap Space
9497
uses: pierotofy/set-swap-space@master
9598
with:
9699
swap-size-gb: 12
97100

98-
- name: Build it
101+
- name: Build it
99102
working-directory: ${{ env.OF_LOCATION }}
100103
continue-on-error: true
101104
run: |
102105
set +e
103106
source build/envsetup.sh
104107
export ALLOW_MISSING_DEPENDENCIES=true
105-
export FOX_BUILD_DEVICE=thyme
106-
export LC_ALL="C"
107108
set -e
108-
lunch ${{ env.DEVICE_MAKEFILE }}-eng && mka adbd ${{ env.DEVICE_BOOT_PARTITION }}image -j$(nproc --all)
109+
lunch ${{ env.DEVICE_MAKEFILE }}-eng && mka adbd ${{ env.DEVICE_BOOT_PARTITION }}image
109110
110-
- name: Take the OrangeFox build
111+
- name: Take the OrangeFox build
111112
uses: actions/upload-artifact@v3
112113
with:
113114
name: OrangeFox
@@ -116,7 +117,7 @@ jobs:
116117
${{ env.OUT_DIR }}/target/product/${{ env.DEVICE_NAME }}/*${{ env.DEVICE_NAME }}.img
117118
${{ env.OUT_DIR }}/target/product/${{ env.DEVICE_NAME }}/*${{ env.DEVICE_NAME }}.zip
118119
119-
- name: Create GitHub Release => (${{ env.BUILD_DATE }})
120+
- name: Create GitHub Release => (${{ env.BUILD_DATE }})
120121
continue-on-error: true
121122
uses: softprops/action-gh-release@v1
122123
with:

TWRP/configs/thyme.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"OrangeFox": {
44
"Repo": "https://gitlab.com/OrangeFox/sync.git",
5-
"Branch": "11.0"
5+
"Branch": "12.1"
66
},
77
"Device": {
88
"Repo": "https://codeberg.org/DogDayAndroid/twrp_device_xiaomi_thyme",

0 commit comments

Comments
 (0)