From a1b01e7701f9fc370f8dff777aad6d39a2c5a3e3 Mon Sep 17 00:00:00 2001 From: Yuichiro Kaneko Date: Fri, 12 May 2023 18:25:10 +0900 Subject: Use Lrama LALR parser generator instead of Bison https://bugs.ruby-lang.org/issues/19637 Co-authored-by: Nobuyoshi Nakada --- .github/workflows/baseruby.yml | 2 +- .github/workflows/bundled_gems.yml | 2 +- .github/workflows/check_dependencies.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/macos.yml | 3 +-- .github/workflows/mingw.yml | 4 ++-- .github/workflows/rjit-bindgen.yml | 2 +- .github/workflows/rjit.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/wasm.yml | 2 +- .github/workflows/windows.yml | 1 - .github/workflows/yjit-ubuntu.yml | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) (limited to '.github') diff --git a/.github/workflows/baseruby.yml b/.github/workflows/baseruby.yml index cc8727bc4e..7a1ef841b8 100644 --- a/.github/workflows/baseruby.yml +++ b/.github/workflows/baseruby.yml @@ -56,7 +56,7 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler: none - run: echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV - - run: sudo apt-get install build-essential autoconf bison libyaml-dev + - run: sudo apt-get install build-essential autoconf libyaml-dev - run: ./autogen.sh - run: ./configure --disable-install-doc - run: make common-srcs diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml index 3396e562c0..c871388f93 100644 --- a/.github/workflows/bundled_gems.yml +++ b/.github/workflows/bundled_gems.yml @@ -76,7 +76,7 @@ jobs: run: | set -x sudo apt-get update -q || : - sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev autoconf ruby if: ${{ steps.diff.outcome == 'failure' }} - name: Build diff --git a/.github/workflows/check_dependencies.yml b/.github/workflows/check_dependencies.yml index cbd88a3e0d..642c3255ce 100644 --- a/.github/workflows/check_dependencies.yml +++ b/.github/workflows/check_dependencies.yml @@ -42,7 +42,7 @@ jobs: run: | set -x sudo apt-get update -q || : - sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev autoconf ruby if: ${{ contains(matrix.os, 'ubuntu') }} - name: Install libraries run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 782424b0d6..c299b9bc62 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -51,7 +51,7 @@ jobs: run: | set -x sudo apt-get update -q || : - sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev autoconf ruby - name: Checkout repository uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4228e0d4d5..908a3f5b61 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -59,12 +59,11 @@ jobs: - name: Install libraries run: | brew upgrade - brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline bison + brew install gmp libffi openssl@1.1 zlib autoconf automake libtool readline working-directory: src - name: Set ENV run: | echo "MAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV - echo "PATH="/usr/local/opt/bison/bin:$PATH"" >> $GITHUB_ENV for lib in openssl@1.1 readline; do CONFIGURE_ARGS="${CONFIGURE_ARGS:+$CONFIGURE_ARGS }--with-${lib%@*}-dir=$(brew --prefix $lib)" done diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 8e0a006d3c..e69da91484 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -85,7 +85,7 @@ jobs: mv /c/Windows/System32/libcrypto-1_1-x64.dll /c/Windows/System32/libcrypto-1_1-x64.dll_ mv /c/Windows/System32/libssl-1_1-x64.dll /c/Windows/System32/libssl-1_1-x64.dll_ result=true - for e in gcc.exe ragel.exe make.exe bison.exe libcrypto-1_1-x64.dll libssl-1_1-x64.dll; do + for e in gcc.exe ragel.exe make.exe libcrypto-1_1-x64.dll libssl-1_1-x64.dll; do echo '##['group']'$'\033[93m'$e$'\033[m' where $e || result=false echo '##['endgroup']' @@ -96,7 +96,7 @@ jobs: run: | # show version result=true - for e in gcc ragel make bison "openssl version"; do + for e in gcc ragel make "openssl version"; do case "$e" in *" "*) ;; *) e="$e --version";; esac echo '##['group']'$'\033[93m'$e$'\033[m' $e || result=false diff --git a/.github/workflows/rjit-bindgen.yml b/.github/workflows/rjit-bindgen.yml index dafbc367f4..86ec4215bd 100644 --- a/.github/workflows/rjit-bindgen.yml +++ b/.github/workflows/rjit-bindgen.yml @@ -53,7 +53,7 @@ jobs: libssl-dev libyaml-dev libreadline6-dev \ zlib1g-dev libncurses5-dev libffi-dev \ libclang1-10 \ - bison autoconf + autoconf sudo apt-get install -q -y pkg-config || : - name: Set up Ruby uses: ruby/setup-ruby@d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c # v1.148.0 diff --git a/.github/workflows/rjit.yml b/.github/workflows/rjit.yml index dce7b78631..f7dc9ad0ee 100644 --- a/.github/workflows/rjit.yml +++ b/.github/workflows/rjit.yml @@ -65,7 +65,7 @@ jobs: ${arch:+cross}build-essential${arch/:/-} \ libssl-dev${arch} libyaml-dev${arch} libreadline6-dev${arch} \ zlib1g-dev${arch} libncurses5-dev${arch} libffi-dev${arch} \ - bison autoconf ruby libcapstone-dev + autoconf ruby libcapstone-dev sudo apt-get install -q -y pkg-config${arch} || : - name: git config run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3deabea9e9..d8a557ab4f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -70,7 +70,7 @@ jobs: ${arch:+cross}build-essential${arch/:/-} \ libssl-dev${arch} libyaml-dev${arch} libreadline6-dev${arch} \ zlib1g-dev${arch} libncurses5-dev${arch} libffi-dev${arch} \ - bison autoconf ruby + autoconf ruby sudo apt-get install -q -y pkg-config${arch} || : - name: git config run: | diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index 3a7bd5e8be..9e123889d6 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -66,7 +66,7 @@ jobs: run: | set -ex sudo apt-get update -q || : - sudo apt-get install --no-install-recommends -q -y ruby bison make autoconf git wget + sudo apt-get install --no-install-recommends -q -y ruby make autoconf git wget wasi_sdk_deb="wasi-sdk_${WASI_SDK_VERSION_MAJOR}.${WASI_SDK_VERSION_MINOR}_amd64.deb" wget "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION_MAJOR}/${wasi_sdk_deb}" diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 311db28744..75f026074f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -79,7 +79,6 @@ jobs: run: | iex "& {$(irm get.scoop.sh)} -RunAsAdmin" Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH - scoop install winflexbison shell: pwsh - name: git config run: | diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml index 710171723a..9cb5c87120 100644 --- a/.github/workflows/yjit-ubuntu.yml +++ b/.github/workflows/yjit-ubuntu.yml @@ -103,7 +103,7 @@ jobs: run: | set -x sudo apt-get update -q || : - sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby + sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev autoconf ruby - name: Install Rust if: ${{ matrix.rust_version }} run: rustup install ${{ matrix.rust_version }} --profile minimal -- cgit v1.2.1