update action

QiuSimons · Jun 30, 2023 · 67ce2e2 · 67ce2e2
1 parent 1707f08
commit 67ce2e2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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