diff --git a/.github/workflows/migrations-test.yml b/.github/workflows/migrations-test.yml index 8c5e1a72898..f57879f55da 100644 --- a/.github/workflows/migrations-test.yml +++ b/.github/workflows/migrations-test.yml @@ -41,14 +41,11 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Install Rust - run: rustup default 1.81 - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: ruby-version: '3.3.4' - - name: Run bundle isntall - run: bundle install + bundler-cache: true - name: Start Clickhouse database run: | docker run -d --rm -p 8123:8123 -p 9000:9000 --ulimit nofile=262144:262144 -v ./clickhouse-s3:/var/lib/clickhouse-s3 -v ./ci/clickhouse/config.xml:/etc/clickhouse-server/config.d/config.xml clickhouse/clickhouse-server diff --git a/.github/workflows/pronto.yml b/.github/workflows/pronto.yml index bdfc933079a..3b0aaac0b88 100644 --- a/.github/workflows/pronto.yml +++ b/.github/workflows/pronto.yml @@ -11,8 +11,6 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Install Rust - run: rustup default 1.81 - name: Setup Ruby uses: ruby/setup-ruby@v1 - name: Setup Rubocop diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index 22e178a1882..641a15ebc00 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -48,8 +48,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - name: Install Rust - run: rustup default 1.81 - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: diff --git a/Dockerfile b/Dockerfile index ce246222c82..14378c57403 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ FROM ruby:3.3.4-slim AS build WORKDIR /app +RUN apt update -qq && apt install nodejs curl build-essential git pkg-config libpq-dev libclang-dev curl -y && \ + curl https://sh.rustup.rs -sSf | bash -s -- -y + COPY ./Gemfile /app/Gemfile COPY ./Gemfile.lock /app/Gemfile.lock -RUN apt update -qq && apt install nodejs curl build-essential git pkg-config libpq-dev libclang-dev curl -y && \ - curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.81 - ENV BUNDLER_VERSION='2.5.5' ENV PATH="$PATH:/root/.cargo/bin/" RUN gem install bundler --no-document -v '2.5.5' diff --git a/Dockerfile.dev b/Dockerfile.dev index 75030fba15a..f4f7af9b60c 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -2,16 +2,16 @@ FROM ruby:3.3.4-slim WORKDIR /app -COPY ./Gemfile /app/Gemfile -COPY ./Gemfile.lock /app/Gemfile.lock - RUN apt update -qq && \ apt install nodejs build-essential curl git pkg-config libpq-dev libclang-dev -y && \ - curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.81 + curl https://sh.rustup.rs -sSf | bash -s -- -y ENV BUNDLER_VERSION='2.5.5' ENV PATH="$PATH:/root/.cargo/bin/" +COPY ./Gemfile /app/Gemfile +COPY ./Gemfile.lock /app/Gemfile.lock + RUN gem install bundler --no-document -v '2.5.5' RUN bundle config build.nokogiri --use-system-libraries && \ diff --git a/Gemfile.lock b/Gemfile.lock index 455c0767b29..3c8e20e7477 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/getlago/lago-expression.git - revision: 76a676544ee71f9476d8c6d7b6bb20a254ac2a90 + revision: a096edf11524bfda7d7f196ddb7722b6c5b8eeae glob: expression-ruby/lago-expression.gemspec specs: lago-expression (0.0.1)