From bc138e689f53f407fb1fd9741c54cab9162f4cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ya=C4=9F=C4=B1z=20Zengin?= <yagizzengin73@gmail.com>
Date: Sat, 26 Oct 2024 11:14:08 +0300
Subject: [PATCH] pmt: fixup wrong workflow

---
 .github/workflows/build.yml | 39 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index da93c6f..ea5ec9f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,22 +15,16 @@ jobs:
         id: cleanup
         uses: rokibhasansagar/slimhub_actions@main
 
-      - name: Setup GitHub CLI
-        id: setup-gh
+      - name: Update and setup packages
+        id: general-packages-progress
         run: |
           type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
           curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
           && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
           && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
           && sudo apt update \
-          && sudo apt install gh -y
-
-      - name: Update and setup packages
-        id: general-packages-progress
-        run: |
-          sudo apt update \
           && sudo apt upgrade -y \
-          && sudo apt install make xz-utils aria2 gawk -y
+          && sudo apt install make xz-utils aria2 gawk gh -y
 
       - name: Save spefic version variables
         id: save-vars
@@ -46,6 +40,7 @@ jobs:
           sudo chmod -R 777 pmt
           echo "PMT_SRCDIR=/home/pmt" >> $GITHUB_ENV
           echo "NDK_DIR=/home/ndk/android-ndk" >> $GITHUB_ENV
+          echo "NDK_IN_DIR=/home/ndk" >> $GITHUB_ENV
           sudo mkdir -p "/home/ndk" && cd "/home/ndk" && sudo chmod 777 "/home/ndk"
 
       - name: Setup Android NDK
@@ -62,11 +57,9 @@ jobs:
       - name: Build pmt
         id: build-pmt
         run: |
-          make gen-ndk-makefiles
           export NDK_PROJECT_PATH=${PWD}
           export NDK_ROOT_DIR=${{ env.NDK_DIR }}
-          echo "NDK_ROOT_DIR=${NDK_ROOT_DIR}" >> $GITHUB_ENV
-          bash build/bash/gen-header
+          . build/bash/gen-header
           cd ${{ env.NDK_DIR }}
           ./ndk-build
         working-directory: ${{ env.PMT_SRCDIR }}
@@ -75,26 +68,18 @@ jobs:
         id: small-transactions
         run: |
           export CXX_64="${PWD}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang++"
-          export CXX_32="${PWD}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++"
-          export AR="${PWD}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
           export CXX_VERSION=$(${CXX_64} --version | head -n 1)
           echo "CXX_VERSION=${CXX_VERSION}" >> $GITHUB_ENV
           . ${{ env.PMT_SRCDIR }}/build/workflow/build.config
           . ${{ env.PMT_SRCDIR }}/build/workflow/relnotes > /home/pmt/release_body.txt
           cd ${{ env.PMT_SRCDIR }}
           zip -rq pmt-objs-local.zip obj/local/arm64-v8a obj/local/armeabi-v7a
-          for arch in arm64-v8a armeabi-v7a; do
-              xz libs/${arch}/pmt
-              mv libs/${arch}/pmt.xz ${PWD}/pmt-${arch}-$(date +%Y%m%d).xz
-          done
-          for CXX_COMP in ${CXX_64} ${CXX_32}; do
-              make clean
-              make PMT_CXX="${CXX_COMP}" PMT_AR="${AR}" PMT_EXTRA_CFLAGS="-D__NDK_BUILD"
-              [[ "${CXX_COMP}" == *"aarch64"* ]] && make deb FOR_THIS=64
-              [[ "${CXX_COMP}" == *"armv7a"* ]] && make deb FOR_THIS=32
-              mv out/debpackage/*.deb .
-              make clean
-          done
+          xz libs/arm64-v8a/pmt
+          xz libs/armeabi-v7a/pmt
+          mv libs/arm64-v8a/pmt.xz ${PWD}/pmt-arm64-v8a-$(date +%Y%m%d).xz
+          mv libs/armeabi-v7a/pmt.xz ${PWD}/pmt-armeabi-v7a-$(date +%Y%m%d).xz
+          cp build/mandoc/mandoc pmt.8
+          gzip -c pmt.8 > mandoc.gz
         working-directory: ${{ env.NDK_DIR }}
 
       - name: Upload to release
@@ -103,8 +88,8 @@ jobs:
         with:
           files: |
             /home/pmt/pmt*.xz
-            /home/pmt/pmt*.deb
             /home/pmt/pmt-objs-local.zip
+            /home/pmt/mandoc.gz
           name: Partition Manager ${{ env.PMT_VERSION }} Release
           tag_name: ${{ env.PMT_VERSION }}
           body_path: /home/pmt/release_body.txt