优化APTC及其清除逻辑,加快第二次构建速度

Author: Numbersf

.github/workflows/Build SukiSU Ultra OnePlus.yml

@@ -269,36 +269,11 @@ jobs:
           git config --global user.name "Numbersf"
           git config --global user.email "263623064@qq.com"
 
-      - name: Configure APTC
-        run: |
-          APT_CACHE_DIR="$HOME/apt-cache"
-          mkdir -p "$APT_CACHE_DIR"/{archives,lists/partial}
-          echo "Dir::Cache \"$APT_CACHE_DIR\";" | sudo tee /etc/apt/apt.conf.d/90user-cache
-          echo "Dir::Cache::archives \"$APT_CACHE_DIR/archives\";" | sudo tee -a /etc/apt/apt.conf.d/90user-cache
-          echo "Dir::State::lists \"$APT_CACHE_DIR/lists\";" | sudo tee -a /etc/apt/apt.conf.d/90user-cache
-          echo "Acquire::Check-Valid-Until \"false\";" | sudo tee -a /etc/apt/apt.conf.d/90user-cache
-          echo "Acquire::Languages \"none\";" | sudo tee -a /etc/apt/apt.conf.d/90user-cache
-          sudo chown -R $USER:$USER "$APT_CACHE_DIR"
-
-      - name: Set APT Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.HOME }}/apt-cache
-          key: ${{ runner.os }}-apt-${{ hashFiles('.github/workflows/Build SukiSU Ultra OnePlus.yml') }}
-          restore-keys: |
-            ${{ runner.os }}-apt-
-
-      - name: Install Dependencies
-        run: |
-          sudo rm -f /var/lib/apt/lists/lock /var/lib/dpkg/lock
-          APT_CACHE_DIR="$HOME/apt-cache"
-          mkdir -p "$APT_CACHE_DIR/lists/partial"
-          sudo apt -o Dir::Cache="$APT_CACHE_DIR" update -qq
-          sudo DEBIAN_FRONTEND=noninteractive apt -o Dir::Cache="$APT_CACHE_DIR" install -yq --no-install-recommends \
-            python3 git curl ccache libelf-dev \
-            build-essential flex bison libssl-dev \
-            libncurses-dev liblz4-tool zlib1g-dev \
-            libxml2-utils rsync unzip
+      - name: Install Dependencies + APTC
+        uses: awalsh128/cache-apt-pkgs-action@latest 
+        with: 
+          packages: python3 git curl ccache libelf-dev build-essential flex bison libssl-dev libncurses-dev liblz4-tool zlib1g-dev libxml2-utils rsync unzip gawk
+          execute_install_scripts: true
 
       - name: Restore Ccache
         uses: actions/cache@v3

.github/workflows/delete.yml

@@ -38,7 +38,7 @@ on:
         type: boolean
         default: false
       clear_cache:
-        description: '是否删除所有ccache缓存？'
+        description: '是否删除所有缓存？'
         required: false
         type: boolean
         default: false
@@ -154,7 +154,7 @@ jobs:
     permissions:
       actions: write
     steps:
-      - name: 删除并重置缓存
+      - name: 删除并重置缓存 (ccache + apt-cache)
         uses: actions/github-script@v6
         with:
           script: |
@@ -174,7 +174,11 @@ jobs:
               if (!caches || caches.length === 0) break;
 
               for (const cache of caches) {
-                if (cache.key.startsWith('ccache-')) {
+                if (
+                  cache.key.startsWith('ccache-') ||
+                  cache.key.includes('apt-cache') ||
+                  cache.key.includes('apt')
+                ) {
                   console.log(`删除缓存: ${cache.key}`);
                   await github.rest.actions.deleteActionsCacheById({
                     owner,