From 7dab8ad243cc240e811ec639da63cca90270c866 Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Mon, 18 May 2026 09:57:17 +0100 Subject: [PATCH] No need to call Yarn within Bundler --- .github/workflows/lint.yml | 10 +++++----- .github/workflows/tests.yml | 2 +- Dockerfile | 2 +- doc/CONFIGURE.md | 2 +- doc/MANUAL_INSTALL.md | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 95fd0d81f..33d62a9e3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -58,11 +58,11 @@ jobs: with: cache: yarn - name: Install node modules - run: bundle exec bin/yarn install + run: bin/yarn install - name: Create dummy database configuration run: cp config/example.database.yml config/database.yml - name: Run herb linter - run: bundle exec bin/yarn run herb-lint + run: bin/yarn run herb-lint eslint: name: ESLint runs-on: ubuntu-latest @@ -80,7 +80,7 @@ jobs: with: cache: yarn - name: Install node modules - run: bundle exec bin/yarn install + run: bin/yarn install - name: Create dummy database configuration run: cp config/example.database.yml config/database.yml - name: Run eslint @@ -122,7 +122,7 @@ jobs: with: cache: yarn - name: Install node modules - run: bundle exec bin/yarn install + run: bin/yarn install - name: Install packages run: | sudo apt-get -yqq update @@ -160,7 +160,7 @@ jobs: with: cache: yarn - name: Install node modules - run: bundle exec bin/yarn install + run: bin/yarn install - name: Install packages run: | sudo apt-get -yqq update diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ed03bf856..d36c3e984 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,7 @@ jobs: cp config/example.storage.yml config/storage.yml touch config/settings.local.yml - name: Install node modules - run: bundle exec bin/yarn install + run: bin/yarn install - name: Populate database run: | sed -f script/normalise-structure db/structure.sql > db/structure.expected diff --git a/Dockerfile b/Dockerfile index a0e81743d..321f46b64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ RUN bundle install # Install NodeJS packages using yarn COPY package.json yarn.lock /app/ COPY bin/yarn /app/bin/ -RUN bundle exec bin/yarn install +RUN bin/yarn install # Copy and set entrypoint COPY docker/entrypoint.sh /entrypoint.sh diff --git a/doc/CONFIGURE.md b/doc/CONFIGURE.md index 9709793c2..97595231d 100644 --- a/doc/CONFIGURE.md +++ b/doc/CONFIGURE.md @@ -212,7 +212,7 @@ We use [ActionMailer Previews](https://guides.rubyonrails.org/action_mailer_basi > > - **Update Node.js modules:** If Node.js modules have been updated, run: > ```bash -> bundle exec bin/yarn install +> bin/yarn install > ``` > > - **Run database migrations:** The OSM database schema is changed periodically. To keep up with improvements: diff --git a/doc/MANUAL_INSTALL.md b/doc/MANUAL_INSTALL.md index 7ecf94a75..a89f02bc5 100644 --- a/doc/MANUAL_INSTALL.md +++ b/doc/MANUAL_INSTALL.md @@ -138,7 +138,7 @@ bundle install We use [Yarn](https://yarnpkg.com/) to manage the Node.js modules required for the project. ```bash -bundle exec bin/yarn install +bin/yarn install ``` ## Step 4: Prepare Configuration Files -- 2.47.3