Skip to content

Commit 3c38a68

Browse files
committed
Test CI using git commit
1 parent ba97c02 commit 3c38a68

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
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=before-adapter-refactor bundle install \
28+
&& RAILS_COMMIT=0b3320bcd5e705302b5707bcf27a80537b812c1f bundle install \
2929
&& rm -rf /tmp/activerecord-sqlserver-adapter
3030
RUN chown -R vscode:vscode /usr/local/rvm

Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ WORKDIR $WORKDIR
99

1010
COPY . $WORKDIR
1111

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
1313

1414
CMD ["sh"]

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ gem "msgpack", ">= 1.7.0"
1717
if ENV["RAILS_SOURCE"]
1818
gemspec path: ENV["RAILS_SOURCE"]
1919
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"]
2123
else
2224
# Need to get rails source because the gem doesn't include tests
2325
version = ENV["RAILS_VERSION"] || begin

docker-compose.ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
ci:
66
environment:
77
- ACTIVERECORD_UNITTEST_HOST=sqlserver
8-
- RAILS_BRANCH=before-adapter-refactor
8+
- RAILS_COMMIT=0b3320bcd5e705302b5707bcf27a80537b812c1f
99
build:
1010
context: .
1111
dockerfile: Dockerfile.ci

0 commit comments

Comments
 (0)