summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-06-16 11:44:31 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-06-16 12:15:55 +0900
commit466d3e68da5df4f76d87332ff6786a391cc8bde4 (patch)
tree89bd45963fa2745cdc7278c263cc367a429c82eb
parentb52862d35f21710d473921b625f2104be01db900 (diff)
Just update sources in CI without fetching
Also install external libraries only, extract-gems does not work unless base ruby is available.
-rw-r--r--.github/workflows/compilers.yml8
-rw-r--r--.github/workflows/macos.yml5
-rw-r--r--.github/workflows/mingw.yml9
-rw-r--r--.github/workflows/mjit.yml5
-rw-r--r--.github/workflows/ubuntu.yml5
-rw-r--r--.github/workflows/windows.yml5
-rw-r--r--.travis.yml2
-rw-r--r--appveyor.yml3
8 files changed, 32 insertions, 10 deletions
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index b830b7c..9314cc2 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 fd38b77..18e3d25 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 fa3410e..95abd33 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 c804683..d575615 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 9f588f0..ef134d7 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 a3822c3..9e9b512 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 20a70a2..59f5028 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 71dd193..75452e2 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