From b018511dc0bd1ef3e2dd29b19d72e9eb28498000 Mon Sep 17 00:00:00 2001
From: SuperKali <hello@superkali.me>
Date: Wed, 29 Jan 2025 19:59:09 +0000
Subject: [PATCH] Optimize workflows, stable, nightly and manually

---
 .../workflows/immortalwrt-builder-nightly.yml | 22 +++++--------------
 .../immortalwrt-builder-selfhost.yml          |  2 +-
 .../workflows/immortalwrt-builder-stable.yml  | 22 +++++--------------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/immortalwrt-builder-nightly.yml b/.github/workflows/immortalwrt-builder-nightly.yml
index 6b87b71..4e910de 100644
--- a/.github/workflows/immortalwrt-builder-nightly.yml
+++ b/.github/workflows/immortalwrt-builder-nightly.yml
@@ -72,14 +72,10 @@ jobs:
       run: |
         cp -r dts/${{env.BANANAWRT_RELEASE}}/* ${{ runner.workspace }}/immortalwrt/target/linux/mediatek/dts/
 
-    - name: Update Package Feeds
-      run: |
-        cd ${{ runner.workspace }}/immortalwrt
+    - name: Update and Install Package Feeds
+      working-directory: ${{ runner.workspace }}/immortalwrt
+      run: |  
         ./scripts/feeds update -a
-
-    - name: Install Package Feeds
-      run: |
-        cd ${{ runner.workspace }}/immortalwrt
         ./scripts/feeds install -a
 
     - name: Apply Custom Configuration
@@ -92,8 +88,8 @@ jobs:
         ./scripts/feeds install -p additional_pack -a
 
     - name: Diffconfig with current configuration
+      working-directory: ${{ runner.workspace }}/immortalwrt
       run: |
-        cd ${{ runner.workspace }}/immortalwrt
         ./scripts/diffconfig.sh > diffconfig
         curl https://downloads.immortalwrt.org/releases/$REPO_BRANCH/targets/mediatek/filogic/config.buildinfo
         cat diffconfig >> config.buildinfo
@@ -101,19 +97,11 @@ jobs:
         [ -n "$REPO_BRANCH" ] && sed -i \
           -e 's|^CONFIG_VERSION_REPO=.*|CONFIG_VERSION_REPO="https://downloads.immortalwrt.org/releases/'"$REPO_BRANCH"'"|g' \
           .config
-
-
-    - name: Download Required Packages
-      run: |
-        cd ${{ runner.workspace }}/immortalwrt
         make defconfig
-        make download -j$(nproc)
-        find dl -size -1024c -exec ls -l {} \;
-        find dl -size -1024c -exec rm -f {} \;
 
     - name: Build Firmware
+      working-directory: ${{ runner.workspace }}/immortalwrt
       run: |
-        cd ${{ runner.workspace }}/immortalwrt
         make -j$(nproc) || make -j1 V=s
         grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' > DEVICE_NAME
         echo "FILE_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_ENV
diff --git a/.github/workflows/immortalwrt-builder-selfhost.yml b/.github/workflows/immortalwrt-builder-selfhost.yml
index 94d38d7..9152fc7 100644
--- a/.github/workflows/immortalwrt-builder-selfhost.yml
+++ b/.github/workflows/immortalwrt-builder-selfhost.yml
@@ -126,7 +126,7 @@ jobs:
       working-directory: ${{ runner.workspace }}/immortalwrt
       run: |
 
-        make -j$(nproc) ||  make -j$(nproc) || make -j1 V=s
+        make -j$(nproc) || make -j1 V=s
         grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' > DEVICE_NAME
         echo "FILE_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_ENV
 
diff --git a/.github/workflows/immortalwrt-builder-stable.yml b/.github/workflows/immortalwrt-builder-stable.yml
index 387e1d1..6af78d8 100644
--- a/.github/workflows/immortalwrt-builder-stable.yml
+++ b/.github/workflows/immortalwrt-builder-stable.yml
@@ -72,14 +72,10 @@ jobs:
       run: |
         cp -r dts/${{ env.BANANAWRT_RELEASE }}/* ${{ runner.workspace }}/immortalwrt/target/linux/mediatek/dts/
 
-    - name: Update Package Feeds
-      run: |
-        cd ${{ runner.workspace }}/immortalwrt
+    - name: Update and Install Package Feeds
+      working-directory: ${{ runner.workspace }}/immortalwrt
+      run: |  
         ./scripts/feeds update -a
-
-    - name: Install Package Feeds
-      run: |
-        cd ${{ runner.workspace }}/immortalwrt
         ./scripts/feeds install -a
 
     - name: Apply Custom Configuration
@@ -92,8 +88,8 @@ jobs:
         ./scripts/feeds install -p additional_pack -a
 
     - name: Diffconfig with current configuration
+      working-directory: ${{ runner.workspace }}/immortalwrt
       run: |
-        cd ${{ runner.workspace }}/immortalwrt
         ./scripts/diffconfig.sh > diffconfig
         curl https://downloads.immortalwrt.org/releases/$REPO_BRANCH/targets/mediatek/filogic/config.buildinfo
         cat diffconfig >> config.buildinfo
@@ -101,19 +97,11 @@ jobs:
         [ -n "$REPO_BRANCH" ] && sed -i \
           -e 's|^CONFIG_VERSION_REPO=.*|CONFIG_VERSION_REPO="https://downloads.immortalwrt.org/releases/'"$REPO_BRANCH"'"|g' \
           .config
-
-
-    - name: Download Required Packages
-      run: |
-        cd ${{ runner.workspace }}/immortalwrt
         make defconfig
-        make download -j$(nproc)
-        find dl -size -1024c -exec ls -l {} \;
-        find dl -size -1024c -exec rm -f {} \;
 
     - name: Build Firmware
+      working-directory: ${{ runner.workspace }}/immortalwrt
       run: |
-        cd ${{ runner.workspace }}/immortalwrt
         make -j$(nproc) || make -j1 V=s
         grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/' > DEVICE_NAME
         echo "FILE_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_ENV