Fix appveyor CI library script (#2457)

Cannot run make until after install
SmingHub · Dec 28, 2021 · 18ffd81 · 18ffd81
1 parent 8ca9bd4
commit 18ffd81
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Tools/ci/library/appveyor.txt b/Tools/ci/library/appveyor.txt
@@ -26,17 +26,21 @@ install:
   - ps: |
       Start-Process -FilePath git -ArgumentList "clone $env:SMING_REPO -b $env:SMING_BRANCH --depth 1 sming" -Wait -NoNewWindow
       $env:COMPONENT_SEARCH_DIRS = (resolve-path "$pwd/..").path
-      sming/Tools/ci/setenv.ps1
-      make -C "$env:SMING_HOME" "fetch-$env:APPVEYOR_PROJECT_SLUG"
+      $env:CI_MAKEFILE = (resolve-path "$pwd/sming/Tools/ci/library/Makefile").path
+      . sming/Tools/ci/setenv.ps1
 
   - cmd: |
-      if "%APPVEYOR_BUILD_WORKER_CLOUD%"=="" sming\Tools\ci\install.cmd %SMING_ARCH% %INSTALL_OPTS%
+      if "%APPVEYOR_BUILD_WORKER_CLOUD%"=="" sming\Tools\ci\install.cmd %SMING_ARCH%
 
   - sh: |
       if [ -z "$APPVEYOR_BUILD_WORKER_CLOUD" ]; then
-        . sming/Tools/ci/install.sh ${SMING_ARCH,,} $INSTALL_OPTS
+        . sming/Tools/ci/install.sh ${SMING_ARCH,,}
       fi
 
+  - ps: |
+      Start-Process -FilePath make -ArgumentList "-C $env:SMING_HOME fetch-$env:APPVEYOR_PROJECT_SLUG" -Wait -NoNewWindow
+
+
 build_script:
-  - sh: make -j$(nproc) -f $SMING_HOME/../Tools/ci/library/Makefile
-  - cmd: make -j%NUMBER_OF_PROCESSORS% -f %SMING_HOME%/../Tools/ci/library/Makefile
+  - sh: make -j$(nproc) -f $CI_MAKEFILE
+  - cmd: make -j%NUMBER_OF_PROCESSORS% -f %CI_MAKEFILE%