Skip to content

Commit dd0d3f9

Browse files
authored
Fix CI for Rails 8.0.0.rc1 (#1251)
1 parent 3ad671b commit dd0d3f9

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/t
2525
RUN mkdir -p /tmp/activerecord-sqlserver-adapter
2626
COPY Gemfile VERSION activerecord-sqlserver-adapter.gemspec /tmp/activerecord-sqlserver-adapter/
2727
RUN cd /tmp/activerecord-sqlserver-adapter \
28-
&& RAILS_BRANCH=main bundle install \
28+
&& bundle install \
2929
&& rm -rf /tmp/activerecord-sqlserver-adapter
3030
RUN chown -R vscode:vscode /usr/local/rvm

Dockerfile.ci

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ WORKDIR $WORKDIR
99

1010
COPY . $WORKDIR
1111

12-
RUN RAILS_BRANCH=main bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3
12+
RUN bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3
1313

1414
CMD ["sh"]

docker-compose.ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ services:
55
ci:
66
environment:
77
- ACTIVERECORD_UNITTEST_HOST=sqlserver
8-
- RAILS_BRANCH=main
98
build:
109
context: .
1110
dockerfile: Dockerfile.ci

0 commit comments

Comments
 (0)