Skip to content

Commit

Permalink
Merge pull request #1779 from diowa/chore/fix-ci
Browse files Browse the repository at this point in the history
Attempt to fix CI specs
  • Loading branch information
tagliala authored Aug 18, 2024
2 parents a7fa7a7 + 007cead commit bd3331a
Show file tree
Hide file tree
Showing 4 changed files with 155 additions and 162 deletions.
57 changes: 29 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,32 @@ jobs:
options: --entrypoint redis-server

steps:
- name: Install GEOS
run: |
sudo apt-get update
sudo apt-get -yq --no-install-suggests --no-install-recommends install libgeos-dev
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.4'
bundler-cache: true
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- name: Yarn
run: yarn
- name: Set up Database
run: bundle exec rails db:prepare
- name: Check GEOS support
run: bundle exec rails rgeo_supports_geos
- name: Run specs
run: bundle exec rake spec
- name: Coveralls
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: 'coverage/lcov.info'
- name: Install GEOS
run: |
sudo apt-get update
sudo apt-get -yq --no-install-suggests --no-install-recommends install libgeos-dev
- name: Set up Actions
uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.4'
bundler-cache: true
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'yarn'
- name: Yarn
run: yarn
- name: Set up Database
run: bundle exec rails db:prepare
- name: Check GEOS support
run: bundle exec rails rgeo_supports_geos
- name: Run specs
run: bundle exec rake spec
- name: Coveralls
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: 'coverage/lcov.info'
9 changes: 3 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ GEM
hashie (5.0.0)
htmlentities (4.3.4)
http-accept (1.7.0)
http-cookie (1.0.6)
http-cookie (1.0.7)
domain_name (~> 0.5)
http_accept_language (2.1.1)
i18n (1.14.5)
Expand Down Expand Up @@ -244,8 +244,6 @@ GEM
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
oauth2 (2.0.9)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
Expand All @@ -268,7 +266,7 @@ GEM
omniauth (~> 2.0)
orm_adapter (0.5.0)
package_json (0.1.0)
parallel (1.26.2)
parallel (1.26.3)
parser (3.3.4.2)
ast (~> 2.4.1)
racc
Expand Down Expand Up @@ -381,7 +379,7 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.0)
rubocop-ast (1.32.1)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
Expand Down Expand Up @@ -480,7 +478,6 @@ GEM

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
activerecord-postgis-adapter (~> 9.0)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-import": "^16.1.0",
"postcss-loader": "^8.1.1",
"postcss-preset-env": "^10.0.0",
"postcss-preset-env": "^10.0.1",
"resolve-url-loader": "^5.0.0",
"sass": "1.77.6",
"sass-loader": "^16.0.0",
Expand All @@ -61,7 +61,7 @@
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.6.0",
"eslint-webpack-plugin": "^4.2.0",
"stylelint": "^16.8.1",
"stylelint": "^16.8.2",
"stylelint-config-twbs-bootstrap": "^14.2.0",
"stylelint-order": "^6.0.4",
"stylelint-scss": "^6.5.0",
Expand Down
Loading

0 comments on commit bd3331a

Please sign in to comment.