Skip to content

Commit

Permalink
Rename .travis_* files to ci/*.
Browse files Browse the repository at this point in the history
The "ci" is the commonly used keyword not depending on the specific
CI services.
  • Loading branch information
junaruga committed Mar 2, 2021
1 parent 6e194e9 commit 423b243
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
include:
# Allow failure due to Mysql2::Error: Unknown system variable 'session_track_system_variables'.
- {os: ubuntu-16.04, ruby: 2.4, db: mariadb10.0, allow-failure: true}
# Comment out due to .travis_setup.sh stucking.
# Comment out due to ci/setup.sh stucking.
# - {os: ubuntu-18.04, ruby: 2.4, db: mariadb10.1, allow-failure: false}
# Allow failure due to the issue #1165.
- {os: ubuntu-20.04, ruby: 2.4, db: mariadb10.3, allow-failure: true}
Expand Down Expand Up @@ -62,5 +62,5 @@ jobs:
- if: matrix.db != ''
run: echo 'DB=${{ matrix.db }}' >> $GITHUB_ENV
- run: sudo echo "127.0.0.1 mysql2gem.example.com" | sudo tee -a /etc/hosts
- run: bash .travis_setup.sh
- run: bash ci/setup.sh
- run: bundle exec rake
2 changes: 1 addition & 1 deletion .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v2
- run: docker build -t mysql2 -f .travis_Dockerfile_${{ matrix.distro }} --build-arg IMAGE=${{ matrix.image }} .
- run: docker build -t mysql2 -f ci/Dockerfile_${{ matrix.distro }} --build-arg IMAGE=${{ matrix.image }} .
# Add the "--cap-add=... --security-opt seccomp=..." options
# as a temporary workaround to avoid the following issue
# in the Fedora >= 34 containers.
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ before_install:
- gem update --system --quiet || gem update --system 2.7.10 --quiet
- gem update bundler
- gem --version
- bash .travis_setup.sh
- bash ci/setup.sh
addons:
hosts:
- mysql2gem.example.com
Expand Down
2 changes: 1 addition & 1 deletion .travis_Dockerfile_centos → ci/Dockerfile_centos
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ RUN yum -yq install \
RUN gem install --no-document "rubygems-update:~>2.7" && update_rubygems > /dev/null
RUN gem install --no-document "bundler:~>1.17"

CMD bash .travis_container.sh
CMD bash ci/container.sh
2 changes: 1 addition & 1 deletion .travis_Dockerfile_fedora → ci/Dockerfile_fedora
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ RUN dnf -yq install \
rubygem-bigdecimal \
rubygem-bundler

CMD bash .travis_container.sh
CMD bash ci/container.sh
2 changes: 1 addition & 1 deletion .travis_container.sh → ci/container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ ruby -v
bundle install --path vendor/bundle --without benchmarks development

# Start mysqld service.
bash .travis_setup_container.sh
bash ci/setup_container.sh

bundle exec rake
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions .travis_setup.sh → ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ fi

# Install MySQL 5.5 if DB=mysql55
if [[ -n ${DB-} && x$DB =~ ^xmysql55 ]]; then
sudo bash .travis_mysql55.sh
sudo bash ci/mysql55.sh
fi

# Install MySQL 5.7 if DB=mysql57
if [[ -n ${DB-} && x$DB =~ ^xmysql57 ]]; then
sudo bash .travis_mysql57.sh
sudo bash ci/mysql57.sh
CHANGED_PASSWORD=true
fi

# Install MySQL 8.0 if DB=mysql80
if [[ -n ${DB-} && x$DB =~ ^xmysql80 ]]; then
sudo bash .travis_mysql80.sh
sudo bash ci/mysql80.sh
CHANGED_PASSWORD=true
fi

Expand Down Expand Up @@ -98,7 +98,7 @@ fi

# TODO: get SSL working on OS X in Travis
if ! [[ x$OSTYPE =~ ^xdarwin ]]; then
sudo bash .travis_ssl.sh
sudo bash ci/ssl.sh
sudo service mysql restart
fi

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 423b243

Please sign in to comment.