Skip to content

Commit

Permalink
Merge pull request #270 from decidim-ice/develop
Browse files Browse the repository at this point in the history
Upgrade to 0.28
  • Loading branch information
microstudi authored Aug 1, 2024
2 parents 058af7d + d3b5076 commit 755f361
Show file tree
Hide file tree
Showing 426 changed files with 15,866 additions and 14,761 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 18.17.1

jobs:
lint-report:
Expand Down
56 changes: 0 additions & 56 deletions .github/workflows/precompile.yml

This file was deleted.

79 changes: 0 additions & 79 deletions .github/workflows/tests-legacy.yml

This file was deleted.

131 changes: 105 additions & 26 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "[CI] Tests 0.27"
name: "[CI] Tests 0.28"

on:
push:
Expand All @@ -9,27 +9,24 @@ on:
env:
CI: 1
SIMPLECOV: 1
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.0.6
NODE_VERSION: 18.17.1
RUBY_VERSION: 3.1.1
BUNDLE_GEMFILE: Gemfile
DISPLAY: ":99"
PARALLEL_TEST_PROCESSORS: 2
SHAKAPACKER_RUNTIME_COMPILE: "false"
NODE_ENV: "test"
RAILS_ENV: "test"
RUBYOPT: '-W:no-deprecated'
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
DATABASE_HOST: localhost
POSTGRES_PASSWORD: postgres

jobs:
tests-latest:
build:
name: Build & Precompile
runs-on: ubuntu-latest
strategy:
matrix:
include:
- rspec: awesome_summary_spec.rb
features: disabled
- rspec: " --exclude-pattern 'spec/system/**/*_spec.rb'"
features: enabled
- rspec: system/admin
features: enabled
- rspec: system/*_spec.rb
features: enabled
- rspec: system/awesome_map
features: enabled
fail-fast: false

services:
postgres:
Expand All @@ -42,10 +39,6 @@ jobs:
--health-retries 5
env:
POSTGRES_PASSWORD: postgres
env:
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
DATABASE_HOST: localhost

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -75,18 +68,104 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}

- name: Setup Test App
run: bundle exec rake test_app
- uses: actions/cache@v3
id: app-cache
with:
path: ./spec/decidim_dummy_app/
key: app-${{ github.sha }}
restore-keys: app-${{ github.sha }}

- run: bundle exec rake test_app
name: Create test app
shell: "bash"

- run: mkdir -p ./spec/decidim_dummy_app/tmp/screenshots
name: Create the screenshots folder
shell: "bash"

- run: bundle exec rails assets:precompile
name: Precompile assets
working-directory: ./spec/decidim_dummy_app/
shell: "bash"
env:
BUNDLE_GEMFILE: ../../Gemfile

- run: tar -zcf /tmp/testapp-env.tar.gz ./spec/decidim_dummy_app

- uses: actions/upload-artifact@v3
with:
name: workspace
path: /tmp/testapp-env.tar.gz

tests-latest:
name: Tests latest
runs-on: ubuntu-latest
needs: build

strategy:
matrix:
include:
- rspec: spec/awesome_summary_spec.rb
features: disabled
- rspec: spec\/(?!system)
features: enabled
- rspec: spec/system/admin
features: enabled
- rspec: spec/system/public
features: enabled
- rspec: spec/system/awesome_map
features: enabled
fail-fast: false

services:
postgres:
image: postgres:11
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
env:
POSTGRES_PASSWORD: postgres

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- uses: actions/download-artifact@v3
with:
name: workspace
path: /tmp

- run: tar -zxf /tmp/testapp-env.tar.gz
name: Restore application

- run: bundle exec rake parallel:create parallel:load_schema
name: Parallel tests
shell: "bash"
working-directory: ./spec/decidim_dummy_app/
env:
BUNDLE_GEMFILE: ../../Gemfile

- name: General RSpec with config vars ${{ matrix.features }}
run: bundle exec rspec spec/${{ matrix.rspec }}
run: |
sudo Xvfb -ac $DISPLAY -screen 0 1920x1084x24 > /dev/null 2>&1 & # optional
ln -s spec/decidim_dummy_app spec/decidim_dummy_app_last
bundle exec rake parallel:spec['${{ matrix.rspec }}']
env:
FEATURES: ${{ matrix.features }}

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3

- uses: actions/upload-artifact@v2-preview
- uses: actions/upload-artifact@v3
if: always()
with:
name: screenshots
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ node_modules/
npm_debug.log

.ruby-version
.rubocop-http*
2 changes: 1 addition & 1 deletion .gitpod.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ RUN sudo apt-get update && sudo apt-get install -y redis-server apt-transport-h
USER gitpod
SHELL ["/bin/bash", "-c"]

RUN cd && /home/gitpod/.rvm/bin/rvm install "ruby-3.0.5"
RUN cd && /home/gitpod/.rvm/bin/rvm install "ruby-3.1.1"
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tasks:
command: bundle exec rspec
#- name: webpacker
# before: rvm --default use "ruby-3.0.4"
# command: bin/webpack-dev-server
# command: bin/shakapacker-dev-server
vscode:
extensions:
- dbaeumer.vscode-eslint
Expand Down
Loading

0 comments on commit 755f361

Please sign in to comment.