From 643ac9e51d255af712cc8be1520050a5ab0e6dbb Mon Sep 17 00:00:00 2001
From: cfig <yuyezhong@gmail.com>
Date: Sat, 20 Jan 2024 23:24:35 +0800
Subject: [PATCH] fix auto test failure under Windows

migrate all test resources to github
---
 .github/workflows/main.yml      | 2 +-
 .gitmodules                     | 6 +++---
 README.md                       | 2 +-
 src/integrationTest/resources_2 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 79100047..47106bbf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -90,7 +90,7 @@ jobs:
         run: python -c "import sys; print(sys.version)"
 
       - name: choco
-        run: choco install openssl dtc-msys2
+        run: choco install openssl dtc-msys2 zip vim
 
       - name: Unit Test
         run: ./gradlew.bat check && ./gradlew.bat clean || true
diff --git a/.gitmodules b/.gitmodules
index b0ed05a2..5e8ae900 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "src/integrationTest/resources"]
 	path = src/integrationTest/resources
 	url = https://github.com/cfig/android_image_res
-[submodule "src/integrationTest/resources_2"]
-	path = src/integrationTest/resources_2
-	url = https://gitee.com/cfig/android_image_res2.git
 [submodule "src/integrationTest/resources_3"]
 	path = src/integrationTest/resources_3
 	url = https://github.com/cfig/android_image_res3.git
+[submodule "src/integrationTest/resources_2"]
+	path = src/integrationTest/resources_2
+	url = https://github.com/cfig/android_image_res2.git
diff --git a/README.md b/README.md
index bd0ecbb3..2a2bf8ad 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Make sure you have [JDK11+](https://www.oracle.com/java/technologies/downloads/#
 * Mac: `brew install lz4 xz dtc`
 
 * Windows: Install openssl and device-tree compiler with [chocolate](https://chocolatey.org/install)
-`choco install openssl dtc-msys2`
+`choco install openssl dtc-msys2 zip vim`
 
 ## Getting Started
 Put your boot.img to current directory, then start gradle 'unpack' task:
diff --git a/src/integrationTest/resources_2 b/src/integrationTest/resources_2
index 106cacec..0135bc6a 160000
--- a/src/integrationTest/resources_2
+++ b/src/integrationTest/resources_2
@@ -1 +1 @@
-Subproject commit 106cacece826ef18b67117118a37ff034ec72f61
+Subproject commit 0135bc6ad9679372cc562e571861671544269532