From 67ce2e2ddb07fd212bcdf83a9bc753bc8ffc9805 Mon Sep 17 00:00:00 2001
From: QiuSimons <45143996+QiuSimons@users.noreply.github.com>
Date: Fri, 30 Jun 2023 09:48:43 +0800
Subject: [PATCH] update action

---
 .github/workflows/R2C-OpenWrt.yml | 3 ++-
 .github/workflows/R2S-OpenWrt.yml | 3 ++-
 .github/workflows/R4S-OpenWrt.yml | 3 ++-
 .github/workflows/X86-OpenWrt.yml | 3 ++-
 SCRIPTS/02_prepare_package.sh     | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/R2C-OpenWrt.yml b/.github/workflows/R2C-OpenWrt.yml
index a5ad3f170..a0c72bafc 100644
--- a/.github/workflows/R2C-OpenWrt.yml
+++ b/.github/workflows/R2C-OpenWrt.yml
@@ -44,6 +44,7 @@ jobs:
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
+        sudo -E git config --global core.abbrev auto
         df -h
     - name: Prepare Mixedwrt
       run: |
@@ -130,7 +131,7 @@ jobs:
 
     - name: Create release
       id: create_release
-      uses: ncipollo/release-action@main
+      uses: ncipollo/release-action@v1.12.0
       with:
         name: OpenWRT-${{ env.latest_release }}
         allowUpdates: true
diff --git a/.github/workflows/R2S-OpenWrt.yml b/.github/workflows/R2S-OpenWrt.yml
index b3c9170aa..cd4c572b6 100644
--- a/.github/workflows/R2S-OpenWrt.yml
+++ b/.github/workflows/R2S-OpenWrt.yml
@@ -44,6 +44,7 @@ jobs:
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
+        sudo -E git config --global core.abbrev auto
         df -h
     - name: Prepare Mixedwrt
       run: |
@@ -130,7 +131,7 @@ jobs:
 
     - name: Create release
       id: create_release
-      uses: ncipollo/release-action@main
+      uses: ncipollo/release-action@v1.12.0
       with:
         name: OpenWRT-${{ env.latest_release }}
         allowUpdates: true
diff --git a/.github/workflows/R4S-OpenWrt.yml b/.github/workflows/R4S-OpenWrt.yml
index 2a5d18352..dc48b41c3 100644
--- a/.github/workflows/R4S-OpenWrt.yml
+++ b/.github/workflows/R4S-OpenWrt.yml
@@ -44,6 +44,7 @@ jobs:
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
+        sudo -E git config --global core.abbrev auto
         df -h
     - name: Prepare Mixedwrt
       run: |
@@ -130,7 +131,7 @@ jobs:
 
     - name: Create release
       id: create_release
-      uses: ncipollo/release-action@main
+      uses: ncipollo/release-action@v1.12.0
       with:
         name: OpenWRT-${{ env.latest_release }}
         allowUpdates: true
diff --git a/.github/workflows/X86-OpenWrt.yml b/.github/workflows/X86-OpenWrt.yml
index d2af48fd4..15569951c 100644
--- a/.github/workflows/X86-OpenWrt.yml
+++ b/.github/workflows/X86-OpenWrt.yml
@@ -44,6 +44,7 @@ jobs:
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
+        sudo -E git config --global core.abbrev auto
         df -h
     - name: Prepare Mixedwrt
       run: |
@@ -130,7 +131,7 @@ jobs:
 
     - name: Create release
       id: create_release
-      uses: ncipollo/release-action@main
+      uses: ncipollo/release-action@v1.12.0
       with:
         name: OpenWRT-${{ env.latest_release }}
         allowUpdates: true
diff --git a/SCRIPTS/02_prepare_package.sh b/SCRIPTS/02_prepare_package.sh
index 6dc333227..a542e017c 100755
--- a/SCRIPTS/02_prepare_package.sh
+++ b/SCRIPTS/02_prepare_package.sh
@@ -242,6 +242,7 @@ cp -rf ../dockerman/applications/luci-app-dockerman ./feeds/luci/applications/lu
 sed -i '/auto_start/d' feeds/luci/applications/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman
 pushd feeds/packages
 wget -qO- https://github.com/openwrt/packages/commit/e2e5ee69.patch | patch -p1
+wget -qO- https://github.com/openwrt/packages/pull/20054.patch | patch -p1
 popd
 sed -i '/sysctl.d/d' feeds/packages/utils/dockerd/Makefile
 rm -rf ./feeds/luci/collections/luci-lib-docker