1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No GITPULLOPTIONS by default

Browse Source 
To honor the environment variable, keep GITPULLOPTIONS unset by
default, and appended the option to VCSUP.
This commit is contained in:
Nobuyoshi Nakada 2020-06-04 10:26:40 +09:00
parent 3d71388710
commit 047471c529
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/compilers.yml vendored
View File

@ -33,7 +33,7 @@ env:
UNICODE_AUXILIARY_FILES=. UNICODE_AUXILIARY_FILES=.
UNICODE_EMOJI_FILES=. UNICODE_EMOJI_FILES=.
CONFIGURE_TTY: never CONFIGURE_TTY: never
GITPULLOPTIONS: --no-tags GITPULLOPTIONS: --no-tags origin ${{github.ref}}
RUBY_DEBUG: ci rgengc RUBY_DEBUG: ci rgengc
RUBY_TESTOPTS: >- RUBY_TESTOPTS: >-
-q -q

2
.github/workflows/macos.yml vendored
View File

@ -8,7 +8,7 @@ jobs:
test_task: [ "check", "test-bundler", "test-bundled-gems", "leaked-globals" ] test_task: [ "check", "test-bundler", "test-bundled-gems", "leaked-globals" ]
fail-fast: false fail-fast: false
env: env:
GITPULLOPTIONS: --no-tags GITPULLOPTIONS: --no-tags origin ${{github.ref}}
if: "!contains(github.event.head_commit.message, '[ci skip]')" if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps: steps:
- name: Disable Firewall - name: Disable Firewall

2
.github/workflows/mingw.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048" CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048"
LDFLAGS: "-pipe -fstack-protector-strong" LDFLAGS: "-pipe -fstack-protector-strong"
UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=." UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
GITPULLOPTIONS: --no-tags GITPULLOPTIONS: --no-tags origin ${{github.ref}}
strategy: strategy:
matrix: matrix:
test_task: [ "check" ] # to make job names consistent test_task: [ "check" ] # to make job names consistent

2
.github/workflows/mjit.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
env: env:
TESTOPTS: '-q --tty=no' TESTOPTS: '-q --tty=no'
RUN_OPTS: '--disable-gems --jit-warnings ${{ matrix.jit_opts }}' RUN_OPTS: '--disable-gems --jit-warnings ${{ matrix.jit_opts }}'
GITPULLOPTIONS: --no-tags GITPULLOPTIONS: --no-tags origin ${{github.ref}}
steps: steps:
- name: Install libraries - name: Install libraries
run: | run: |

2
.github/workflows/ubuntu.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
debug: -DRUBY_DEBUG debug: -DRUBY_DEBUG
fail-fast: false fail-fast: false
env: env:
GITPULLOPTIONS: --no-tags GITPULLOPTIONS: --no-tags origin ${{github.ref}}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, '[ci skip]')" if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps: steps:

2
.github/workflows/windows.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
env: env:
GITPULLOPTIONS: --no-tags GITPULLOPTIONS: --no-tags origin ${{github.ref}}
if: "!contains(github.event.head_commit.message, '[ci skip]')" if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps: steps:
- uses: actions/cache@v1 - uses: actions/cache@v1

2
common.mk
View File

@ -38,7 +38,7 @@ RUBYLIB = $(PATH_SEPARATOR)
RUBYOPT = - RUBYOPT = -
RUN_OPTS = --disable-gems RUN_OPTS = --disable-gems
GITPULLOPTIONS = --rebase # GITPULLOPTIONS = --no-tags
INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR) INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)

2
configure.ac
View File

@ -4055,7 +4055,7 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
VCS='echo cannot' VCS='echo cannot'
]) ])
AS_CASE("$VCS", AS_CASE("$VCS",
['$(GIT)'|git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'], ['$(GIT)'|git], [VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)'],
[VCSUP='$(VCS)']) [VCSUP='$(VCS)'])
sed -n \ sed -n \
-e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \ -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \

2
win32/Makefile.sub
View File

@ -499,7 +499,7 @@ HAVE_GIT = no
!if defined(VCS) !if defined(VCS)
!else if exist($(srcdir)/.git) !else if exist($(srcdir)/.git)
VCS = $(GIT) VCS = $(GIT)
VCSUP = $(VCS) pull $(GITPULLOPTIONS) VCSUP = $(VCS) pull --rebase $(GITPULLOPTIONS)
!else !else
VCSUP = rem VCSUP = rem
!endif !endif