Skip to content

Commit

Permalink
workflows: squash
Browse files Browse the repository at this point in the history 
- fix crons
- fix machine used
- switch to checkout@master
- follow index refactor
- dump fota zip for non f2fs aswell
- update prop array
- switch back to softprops/action-gh-release and use @master

Signed-off-by: corsicanu <me@corsicanu.ro>
  • Loading branch information
@corsicanu
corsicanu committed Jun 12, 2024
1 parent 3478ecd commit fa79ddf
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
17 changes: 11 additions & 6 deletions .github/workflows/check.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
need_update=0
latest=`curl --retry 5 --retry-delay 5 http://fota-cloud-dn.ospserver.net/firmware/${{ matrix.region }}/${{ matrix.model }}/version.xml | grep latest | sed 's/^[^>]*>//' | sed 's/<.*//'`
latest_short=`echo $latest | cut -d'/' -f1`
current=`cat current.${{ matrix.model }}_${{ matrix.region }}` || need_update=1
current=`cat index/${{ matrix.model }}.${{ matrix.region }}` || need_update=1
[[ $latest != $current ]] && need_update=1
echo "latest_version=$latest" >> $GITHUB_ENV
echo "latest_shortversion=$latest_short" >> $GITHUB_ENV
Expand Down Expand Up @@ -101,6 +101,10 @@ jobs:
extract-ikconfig boot.img > $releasedir/$target_version-boot.img_defconfig || echo "# Dummy file to keep workflow alive" > $releasedir/$target_version-boot.img_defconfig;
zip -r $releasedir/$target_version-bootrecovery.zip *.img
rm -rf *.img
mkdir -p fota && echo "# Dummy file to keep workflow alive" > $releasedir/$target_version-dummy;
tar xvf ${{ env.ap }} meta-data/fota.zip --strip-components=1
[[ -e fota.zip ]] && unzip -P fotatest1234 fota.zip -d fota && rm -rf fota/OTA fota/BOOT/kernel fota/RECOVERY/kernel
zip -r $releasedir/$target_version-fota.zip fota
parts=(super system vendor)
for i in ${parts[@]}; do [[ `tar tvf ${{ env.ap }} | grep $i` ]] && tar xvf ${{ env.ap }} $(echo `tar tvf ${{ env.ap }} | grep $i | awk -F " " '{print $NF}'`); done
rm -rf *.tar.md5 *boot* *vbmeta*
Expand All @@ -118,7 +122,7 @@ jobs:
[[ -s system/system/build.prop ]] && cd system/system && zip -r $releasedir/$target_version-lib.zip lib* && zip -r $releasedir/$target_version-etc.zip etc && zip -r $releasedir/$target_version-cameradata.zip cameradata && cd $basedir || cd system && zip -r $releasedir/$target_version-lib.zip lib* && zip -r $releasedir/$target_version-etc.zip etc && zip -r $releasedir/$target_version-cameradata.zip cameradata && cd $basedir
if [[ -d vendor ]]; then cd vendor; zip -r $releasedir/$target_version-vendor.zip *; cd $basedir; else cd system/vendor; zip -r $releasedir/$target_version-vendor.zip *; cd $basedir;fi
cd $releasedir && zip -r $target_version-app_frame.zip *apk *jar && zip -r $target_version-txt.zip *.txt *.xml *.prop *defconfig && cd $basedir
props=(ro.build.PDA= ro.build.changelist= ro.build.display.id= ro.build.id= ro.build.version.release= ro.build.version.release_or_codename= ro.build.version.security_patch= ro.build.version.sdk= ro.system.build.fingerprint= ro.build.description= ro.build.version.base_os= ro.vendor.build.id= ro.vendor.build.security_patch= ro.vendor.build.version.release_or_codename= ro.vendor.build.fingerprint= ro.netflix.bsp_rev= ro.hardware.chipname= ro.product.board= ro.board.platform= ro.security.keystore.keytype= ro.build.characteristics=)
props=(ro.build.PDA= ro.build.changelist= ro.build.display.id= ro.build.id= ro.build.version.release= ro.build.version.release_or_codename= ro.build.version.security_patch= ro.build.version.sdk= ro.system.build.fingerprint= ro.build.description= ro.build.version.base_os= ro.vendor.build.id= ro.vendor.build.security_patch= ro.vendor.build.fingerprint= ro.vendor.build.version.release_or_codename= ro.vendor.build.version.sdk= ro.vndk.version= ro.hardware.chipname= ro.product.board= ro.board.platform= ro.security.keystore.keytype= ro.boot.dynamic_partitions= ro.product.first_api_level= ro.build.characteristics= ro.netflix.bsp_rev=)
for file in $releasedir/*.prop; do for prop in ${props[@]}; do echo $(grep $prop $file) >> version.txt; sed -i ':a;N;$!ba;s/\n\n/\n/g' version.txt; done; done
sudo umount system && sudo umount vendor && rm -rf *img
echo "folder=$releasedir" >> $GITHUB_ENV
Expand All @@ -135,9 +139,9 @@ jobs:
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git pull origin ${{github.ref}} --ff-only
echo ${{ env.latest_version }} > current.${{ matrix.model }}_${{ matrix.region }}
git add current.${{ matrix.model }}_${{ matrix.region }}
git commit -m "${{ matrix.model }}: ${{ env.latest_version }}"
echo ${{ env.latest_version }} > index/${{ matrix.model }}.${{ matrix.region }}
git add index/${{ matrix.model }}.${{ matrix.region }}
git commit -m "${{ matrix.model }}/${{ matrix.region }}: ${{ env.latest_version }}"
git tag ${{ env.name }}
- name: Push changes to repo
Expand All @@ -149,7 +153,7 @@ jobs:

- name: Upload release assets
if: env.need_update == 1
uses: CaptainThrowback/action-gh-release@master
uses: softprops/action-gh-release@master
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
Expand All @@ -165,5 +169,6 @@ jobs:
${{ env.folder }}/${{ env.latest_shortversion }}-blcp.zip
${{ env.folder }}/${{ env.latest_shortversion }}-vendor.zip
${{ env.folder }}/${{ env.latest_shortversion }}-bootrecovery.zip
${{ env.folder }}/${{ env.latest_shortversion }}-fota.zip
${{ env.folder }}/${{ env.latest_shortversion }}-csc.zip
21 changes: 11 additions & 10 deletions .github/workflows/f2fs.yml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: F2FS fw files dumper
name: F2FS Firmware dumper

on:
workflow_dispatch:
schedule:
- cron: "0 10/12 * * *"
- cron: "15 */12 * * *"
push:

jobs:
update:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

strategy:
fail-fast: false
Expand All @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@master
with:
submodules: true

Expand All @@ -30,7 +30,7 @@ jobs:
need_update=0
latest=`curl --retry 5 --retry-delay 5 http://fota-cloud-dn.ospserver.net/firmware/${{ matrix.region }}/${{ matrix.model }}/version.xml | grep latest | sed 's/^[^>]*>//' | sed 's/<.*//'`
latest_short=`echo $latest | cut -d'/' -f1`
current=`cat current.${{ matrix.model }}_${{ matrix.region }}` || need_update=1
current=`cat index/${{ matrix.model }}.${{ matrix.region }}` || need_update=1
[[ $latest != $current ]] && need_update=1
echo "latest_version=$latest" >> $GITHUB_ENV
echo "latest_shortversion=$latest_short" >> $GITHUB_ENV
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
tar xvf ${{ env.ap }} meta-data/fota.zip --strip-components=1
[[ -e fota.zip ]] && unzip -P fotatest1234 fota.zip -d fota && rm -rf fota/OTA fota/BOOT/kernel fota/RECOVERY/kernel
zip -r $releasedir/$target_version-fota.zip fota
props=(ro.build.PDA= ro.build.changelist= ro.build.display.id= ro.build.id= ro.build.version.release= ro.build.version.release_or_codename= ro.build.version.security_patch= ro.build.version.sdk= ro.system.build.fingerprint= ro.build.description= ro.build.version.base_os= ro.vendor.build.id= ro.vendor.build.security_patch= ro.vendor.build.version.release_or_codename= ro.vendor.build.fingerprint= ro.netflix.bsp_rev= ro.hardware.chipname= ro.product.board= ro.board.platform= ro.security.keystore.keytype= ro.build.characteristics=)
props=(ro.build.PDA= ro.build.changelist= ro.build.display.id= ro.build.id= ro.build.version.release= ro.build.version.release_or_codename= ro.build.version.security_patch= ro.build.version.sdk= ro.system.build.fingerprint= ro.build.description= ro.build.version.base_os= ro.vendor.build.id= ro.vendor.build.security_patch= ro.vendor.build.fingerprint= ro.vendor.build.version.release_or_codename= ro.vendor.build.version.sdk= ro.vndk.version= ro.hardware.chipname= ro.product.board= ro.board.platform= ro.security.keystore.keytype= ro.boot.dynamic_partitions= ro.product.first_api_level= ro.build.characteristics= ro.netflix.bsp_rev=)
for file in `find fota -type f -name *prop`; do for prop in ${props[@]}; do echo $(grep $prop $file) >> version.txt; sed -i ':a;N;$!ba;s/\n\n/\n/g' version.txt; done; done
parts=(super system vendor)
for i in ${parts[@]}; do [[ `tar tvf ${{ env.ap }} | grep $i` ]] && tar xvf ${{ env.ap }} $(echo `tar tvf ${{ env.ap }} | grep $i | awk -F " " '{print $NF}'`); done
Expand All @@ -130,9 +130,9 @@ jobs:
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git pull origin ${{github.ref}} --ff-only
echo ${{ env.latest_version }} > current.${{ matrix.model }}_${{ matrix.region }}
git add current.${{ matrix.model }}_${{ matrix.region }}
git commit -m "${{ matrix.model }}: ${{ env.latest_version }}"
echo ${{ env.latest_version }} > index/${{ matrix.model }}.${{ matrix.region }}
git add index/${{ matrix.model }}.${{ matrix.region }}
git commit -m "${{ matrix.model }}/${{ matrix.region }}: ${{ env.latest_version }}"
git tag ${{ env.name }}
- name: Push changes to repo
Expand All @@ -144,7 +144,7 @@ jobs:

- name: Upload release assets
if: env.need_update == 1
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@master
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
Expand All @@ -157,3 +157,4 @@ jobs:
${{ env.folder }}/${{ env.latest_shortversion }}-bootrecovery.zip
${{ env.folder }}/${{ env.latest_shortversion }}-fota.zip
${{ env.folder }}/${{ env.latest_shortversion }}-csc.zip

0 comments on commit fa79ddf

Please sign in to comment.