Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup system tests #211

Merged
merged 4 commits into from
Aug 8, 2024
Merged

Cleanup system tests #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64f85e6
Remove version and update docker compose bash command
AlexB52 Aug 6, 2024
26f35f3
Include macos-13 instead of latest
AlexB52 Aug 6, 2024
91bee44
update rubygems to -system 3.2.3
AlexB52 Aug 6, 2024
965e025
Remove gem update for bundler-app
AlexB52 Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- 3.2
- 3.3
include:
- os: macos-latest
- os: macos-13
ruby: 2.5
name: Ruby ${{ matrix.ruby }} test (${{ matrix.os }})
steps:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
/pkg/
/spec/reports/
/tmp/
.ruby-version
.ruby-version
*.DS_Store
2 changes: 1 addition & 1 deletion bin/test/bundler-app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
bundle install
bundle exec rake build
ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/bundler-app/retest.gem
docker-compose -f features/bundler-app/docker-compose.yml up --build --exit-code-from retest
docker compose -f features/bundler-app/docker-compose.yml up --build --exit-code-from retest
2 changes: 1 addition & 1 deletion bin/test/git-ruby
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
bundle install
bundle exec rake build
ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/git-ruby/retest.gem
docker-compose -f features/git-ruby/docker-compose.yml up --build --exit-code-from retest
docker compose -f features/git-ruby/docker-compose.yml up --build --exit-code-from retest
6 changes: 3 additions & 3 deletions bin/test/hanami-app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
bundle install
bundle exec rake build
ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/hanami-app/retest.gem
docker-compose -f features/hanami-app/docker-compose.yml build
docker-compose -f features/hanami-app/docker-compose.yml run retest sh bin/test_setup
docker-compose -f features/hanami-app/docker-compose.yml up --exit-code-from retest
docker compose -f features/hanami-app/docker-compose.yml build
docker compose -f features/hanami-app/docker-compose.yml run retest sh bin/test_setup
docker compose -f features/hanami-app/docker-compose.yml up --exit-code-from retest
2 changes: 1 addition & 1 deletion bin/test/rails-app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
bundle install
bundle exec rake build
ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rails-app/retest.gem
docker-compose -f features/rails-app/docker-compose.yml up --build --exit-code-from retest
docker compose -f features/rails-app/docker-compose.yml up --build --exit-code-from retest
2 changes: 1 addition & 1 deletion bin/test/rspec-rails
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
bundle install
bundle exec rake build
ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rspec-rails/retest.gem
docker-compose -f features/rspec-rails/docker-compose.yml up --build --exit-code-from retest
docker compose -f features/rspec-rails/docker-compose.yml up --build --exit-code-from retest
2 changes: 1 addition & 1 deletion bin/test/rspec-ruby
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
bundle install
bundle exec rake build
ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/rspec-ruby/retest.gem
docker-compose -f features/rspec-ruby/docker-compose.yml up --build --exit-code-from retest
docker compose -f features/rspec-ruby/docker-compose.yml up --build --exit-code-from retest
2 changes: 1 addition & 1 deletion bin/test/ruby-app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
bundle install
bundle exec rake build
ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-app/retest.gem
docker-compose -f features/ruby-app/docker-compose.yml up --build --exit-code-from retest
docker compose -f features/ruby-app/docker-compose.yml up --build --exit-code-from retest
2 changes: 1 addition & 1 deletion bin/test/ruby-bare
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
bundle install
bundle exec rake build
ls -t pkg | head -n1 | xargs -I {} mv pkg/{} features/ruby-bare/retest.gem
docker-compose -f features/ruby-bare/docker-compose.yml up --build --exit-code-from retest
docker compose -f features/ruby-bare/docker-compose.yml up --build --exit-code-from retest
2 changes: 0 additions & 2 deletions features/bundler-app/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
retest:
build: .
Expand Down
1 change: 1 addition & 0 deletions features/git-ruby/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ENV GEM_HOME="/usr/local/bundle"
ENV PATH $GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH

COPY Gemfile Gemfile.lock retest.gem ./
RUN gem update --system 3.2.3
RUN gem install bundler -v 2.1.4
RUN bundle config --delete frozen
RUN bundle install
Expand Down
2 changes: 0 additions & 2 deletions features/git-ruby/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
retest:
build: .
Expand Down
1 change: 1 addition & 0 deletions features/hanami-app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ENV LANG C.UTF-8
ENV BUNDLER_VERSION 1.17.3

COPY Gemfile Gemfile.lock retest.gem ./
RUN gem update --system 3.2.3
RUN gem install bundler -v 1.17.3
RUN bundle install
RUN gem install retest.gem
Expand Down
2 changes: 0 additions & 2 deletions features/hanami-app/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
retest:
build: .
Expand Down
1 change: 1 addition & 0 deletions features/rails-app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ENV LANG C.UTF-8
ENV BUNDLER_VERSION 2.1

COPY Gemfile Gemfile.lock retest.gem ./
RUN gem update --system 3.2.3
RUN gem install bundler -v 2.1.4
RUN bundle install
RUN gem install retest.gem
Expand Down
2 changes: 0 additions & 2 deletions features/rails-app/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
retest:
build: .
Expand Down
1 change: 1 addition & 0 deletions features/rspec-rails/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ENV LANG C.UTF-8
ENV BUNDLER_VERSION 2.1

COPY Gemfile Gemfile.lock retest.gem ./
RUN gem update --system 3.2.3
RUN gem install bundler -v 2.1.4
RUN bundle install
RUN gem install retest.gem
Expand Down
2 changes: 0 additions & 2 deletions features/rspec-rails/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
retest:
build: .
Expand Down
1 change: 1 addition & 0 deletions features/rspec-ruby/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ENV GEM_HOME="/usr/local/bundle"
ENV PATH $GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH

COPY Gemfile Gemfile.lock retest.gem ./
RUN gem update --system 3.2.3
RUN gem install bundler -v 2.1.4
RUN bundle config --delete frozen
RUN bundle install
Expand Down
2 changes: 0 additions & 2 deletions features/rspec-ruby/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
retest:
build: .
Expand Down
1 change: 1 addition & 0 deletions features/ruby-app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ENV GEM_HOME="/usr/local/bundle"
ENV PATH $GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH

COPY Gemfile Gemfile.lock retest.gem ./
RUN gem update --system 3.2.3
RUN gem install bundler -v 2.1.4
RUN bundle config --delete frozen
RUN bundle install
Expand Down
2 changes: 0 additions & 2 deletions features/ruby-app/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
retest:
build: .
Expand Down
1 change: 1 addition & 0 deletions features/ruby-bare/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ WORKDIR /usr/src/app
ENV LANG C.UTF-8

COPY retest.gem ./
RUN gem update --system 3.2.3
RUN gem install retest.gem
RUN gem install minitest -v 5.15.0 # minitest doesn't support some ruby versions

Expand Down
2 changes: 0 additions & 2 deletions features/ruby-bare/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
retest:
build: .
Expand Down