File tree Expand file tree Collapse file tree 4 files changed +6
-4
lines changed Expand file tree Collapse file tree 4 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -25,6 +25,6 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/t
25
25
RUN mkdir -p /tmp/activerecord-sqlserver-adapter
26
26
COPY Gemfile VERSION activerecord-sqlserver-adapter.gemspec /tmp/activerecord-sqlserver-adapter/
27
27
RUN cd /tmp/activerecord-sqlserver-adapter \
28
- && RAILS_BRANCH=before-adapter-refactor bundle install \
28
+ && RAILS_COMMIT=0b3320bcd5e705302b5707bcf27a80537b812c1f bundle install \
29
29
&& rm -rf /tmp/activerecord-sqlserver-adapter
30
30
RUN chown -R vscode:vscode /usr/local/rvm
Original file line number Diff line number Diff line change @@ -9,6 +9,6 @@ WORKDIR $WORKDIR
9
9
10
10
COPY . $WORKDIR
11
11
12
- RUN RAILS_BRANCH=before-adapter-refactor bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3
12
+ RUN RAILS_COMMIT=0b3320bcd5e705302b5707bcf27a80537b812c1f bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3
13
13
14
14
CMD ["sh"]
Original file line number Diff line number Diff line change @@ -17,7 +17,9 @@ gem "msgpack", ">= 1.7.0"
17
17
if ENV [ "RAILS_SOURCE" ]
18
18
gemspec path : ENV [ "RAILS_SOURCE" ]
19
19
elsif ENV [ "RAILS_BRANCH" ]
20
- gem "rails" , github : "aidanharan/rails" , branch : ENV [ "RAILS_BRANCH" ]
20
+ gem "rails" , github : "rails/rails" , branch : ENV [ "RAILS_BRANCH" ]
21
+ elsif ENV [ "RAILS_COMMIT" ]
22
+ gem "rails" , github : "rails/rails" , ref : ENV [ "RAILS_COMMIT" ]
21
23
else
22
24
# Need to get rails source because the gem doesn't include tests
23
25
version = ENV [ "RAILS_VERSION" ] || begin
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ services:
5
5
ci :
6
6
environment :
7
7
- ACTIVERECORD_UNITTEST_HOST=sqlserver
8
- - RAILS_BRANCH=before-adapter-refactor
8
+ - RAILS_COMMIT=0b3320bcd5e705302b5707bcf27a80537b812c1f
9
9
build :
10
10
context : .
11
11
dockerfile : Dockerfile.ci
You can’t perform that action at this time.
0 commit comments