From 466d3e68da5df4f76d87332ff6786a391cc8bde4 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Tue, 16 Jun 2020 11:44:31 +0900
Subject: Just update sources in CI without fetching

Also install external libraries only, extract-gems does not work
unless base ruby is available.
---
 .github/workflows/compilers.yml | 8 ++++----
 .github/workflows/macos.yml     | 5 +++++
 .github/workflows/mingw.yml     | 9 +++++++--
 .github/workflows/mjit.yml      | 5 +++++
 .github/workflows/ubuntu.yml    | 5 +++++
 .github/workflows/windows.yml   | 5 +++--
 .travis.yml                     | 2 +-
 appveyor.yml                    | 3 ++-
 8 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index b830b7c91a..9314cc24c4 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -164,15 +164,15 @@ jobs:
             ${default_configure} \
             ${append_configure} \
             --with-gcc="${default_cc} ${append_cc}"
-      - run: $make incs
+      - name: Update include files
+        run: |
+          $make touch-unicode-files
+          $make $UPDATE_UNICODE -o update-src incs
         working-directory: build
       - run: $make
         working-directory: build
       - run: $make test
         working-directory: build
-      - run: $make $UPDATE_UNICODE up
-        working-directory: build
-        if: "matrix.entry.name == '-O3'"
       - run: $make install
         working-directory: build
         if: "matrix.entry.name == '-O3'"
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index fd38b77e5b..18e3d25a2d 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -38,6 +38,11 @@ jobs:
       - name: Run configure
         run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline)
         working-directory: build
+      - name: Update
+        run: |
+          make touch-unicode-files
+          make -o update-src up
+        working-directory: build
       - run: make $JOBS
         working-directory: build
       - run: make prepare-gems
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index fa3410ee9c..95abd3300d 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -72,11 +72,16 @@ jobs:
           # Write-Host "-------------------------------------- config.log"
           # Get-Content ./config.log | foreach {Write-Output $_}
 
-      - name: download unicode, gems, etc
+      - name: update
+        working-directory: build
+        run: |
+          $jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
+          make -j $jobs incs
+
+      - name: download gems
         working-directory: build
         run: |
           $jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
-          make -j $jobs update-unicode
           make -j $jobs update-gems
 
       - name: make all
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index c804683ad0..d575615937 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -41,6 +41,11 @@ jobs:
       - name: Run configure
         run: ../src/configure -C --disable-install-doc
         working-directory: build
+      - name: Update include files
+        run: |
+          make touch-unicode-files
+          make $JOBS -o update-src incs
+        working-directory: build
       - run: make $JOBS
         working-directory: build
       - run: sudo make $JOBS -s install
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 9f588f0fec..ef134d72f7 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -55,6 +55,11 @@ jobs:
       - name: Run configure
         run: ../src/configure -C --disable-install-doc cppflags=${{ matrix.debug }}
         working-directory: build
+      - name: Update include files
+        run: |
+          make $JOBS touch-unicode-files
+          make $JOBS -o update-src up
+        working-directory: build
       - run: make $JOBS
         working-directory: build
       - run: make prepare-gems
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a3822c357f..9e9b512754 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -55,8 +55,9 @@ jobs:
           call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           set YACC=win_bison
           echo on
-          nmake up
-          nmake extract-gems
+          nmake touch-unicode-files
+          nmake incs
+          nmake extract-extlibs
           nmake
         working-directory: build
         shell: cmd
diff --git a/.travis.yml b/.travis.yml
index 20a70a2fc1..59f50283db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -410,7 +410,7 @@ env:
       - "> .rbconfig.time"
       - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
       - make touch-unicode-files
-      - make -s $JOBS $UPDATE_UNICODE up
+      - make -s $JOBS $UPDATE_UNICODE -o update-src up
       - make -s $JOBS srcs
       - rm -f config.status Makefile rbconfig.rb .rbconfig.time
       - $SETARCH ./configure -C --disable-install-doc --prefix=$RUBY_PREFIX --disable-rubygems 'optflags=-O0' 'debugflags=-save-temps=obj -g'
diff --git a/appveyor.yml b/appveyor.yml
index 71dd19338a..75452e29ea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -47,7 +47,8 @@ for:
     - echo>> Makefile BUILTIN_ENCOBJS=nul
     - type win32\Makefile.sub >> Makefile
     - nmake %mflags% touch-unicode-files
-    - nmake %mflags% %UPDATE_UNICODE% up incs
+    - nmake %mflags% %UPDATE_UNICODE% incs
+    - nmake %mflags% extract-extlibs
     - del Makefile
     - mkdir \usr\local\bin
     - mkdir \usr\local\include
-- 
cgit v1.2.3