Skip to content

Commit 4898510

Browse files
committed
Remove bison installation bits
1 parent 948cfab commit 4898510

File tree

5 files changed

+2
-21
lines changed

5 files changed

+2
-21
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ jobs:
7575
~/.cargo/registry
7676
~/.cargo/git
7777
key: ${{ runner.os }}-cargo-2-${{ hashFiles('**/Cargo.lock') }}
78-
- if: runner.os == 'macOS'
79-
run: |
80-
brew install automake bison
81-
brew link bison --force
82-
echo "/usr/local/opt/bison/bin:$PATH" >> $GITHUB_PATH
8378
- run: cargo test --release
8479
- uses: actions/upload-artifact@v6
8580
with:

.github/workflows/preview-release.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ jobs:
4747
toolchain: 1.91.1
4848
override: true
4949
target: aarch64-unknown-linux-gnu
50-
- if: runner.os == 'macOS'
51-
run: |
52-
brew install automake bison
53-
echo "/usr/local/opt/bison/bin:$PATH" >> $GITHUB_PATH
5450
- run: ./script/make_release
5551
- uses: actions/upload-artifact@v6
5652
with:

.github/workflows/release.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ jobs:
3131
toolchain: 1.91.1
3232
override: true
3333
target: aarch64-unknown-linux-gnu
34-
- if: runner.os == 'macOS'
35-
run: |
36-
brew install automake bison
37-
echo "/usr/local/opt/bison/bin:$PATH" >> $GITHUB_PATH
3834
- run: ./script/make_release
3935
- uses: actions/upload-artifact@v6
4036
with:

dockerfiles/build.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:20.04
22
RUN apt-get update
3-
RUN apt-get install -y git bison build-essential autoconf ruby curl
3+
RUN apt-get install -y git build-essential autoconf ruby curl
44
RUN apt-get install -y zlib1g-dev clang ruby-dev shellcheck
55
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
66
RUN gem install bundler
@@ -9,6 +9,6 @@ RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
99
dpkg-reconfigure --frontend=noninteractive locales && \
1010
update-locale LANG=en_US.UTF-8
1111
ENV LANG en_US.UTF-8
12-
RUN apt-get install -y bison libyaml-dev
12+
RUN apt-get install -y libyaml-dev
1313

1414
ADD ./ /root/rubyfmt.git

script/make_release

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
#!/bin/bash
22
set -euxo pipefail
33

4-
# if darwin, add PATH="/usr/local/opt/bison/bin:$PATH"
5-
if [[ $OSTYPE == "darwin"* ]]; then
6-
export PATH="/opt/homebrew/opt/bison/bin:$PATH"
7-
fi
8-
bison --version
9-
104
TAG=$(git describe --tags --exact-match HEAD)
115
RELEASE_DIR=${RELEASE_DIR:-"tmp/releases/${TAG}-$(uname -s)/"}
126

0 commit comments

Comments
 (0)