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.

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

Upgrade 0.29 #362

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.1.1
RUBY_VERSION: 3.2.2
NODE_VERSION: 18.17.1

jobs:
Expand Down Expand Up @@ -40,4 +40,4 @@ jobs:
name: Lint SCSS files

- run: bundle exec erblint app/**/*.erb
name: Lint ERB files
name: Lint ERB files
66 changes: 36 additions & 30 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "[CI] Tests 0.28"
name: "[CI] Tests 0.29"

on:
push:
Expand All @@ -10,8 +10,9 @@ env:
CI: 1
SIMPLECOV: 1
NODE_VERSION: 18.17.1
RUBY_VERSION: 3.1.1
RUBY_VERSION: 3.2.2
BUNDLE_GEMFILE: Gemfile
DISABLE_SPRING: 1
DISPLAY: ":99"
PARALLEL_TEST_PROCESSORS: 2
SHAKAPACKER_RUNTIME_COMPILE: "false"
Expand All @@ -26,11 +27,11 @@ env:
jobs:
build:
name: Build & Precompile
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

services:
postgres:
image: postgres:11
image: postgres:14
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
Expand All @@ -39,36 +40,30 @@ jobs:
--health-retries 5
env:
POSTGRES_PASSWORD: postgres
redis:
image: redis
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5

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

- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105

- name: List Chrome
run: apt list --installed | grep chrome

- name: Remove Chrome
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

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

- uses: actions/setup-node@master
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'npm'
cache-dependency-path: ./package-lock.json

- uses: actions/cache@v3
- uses: actions/cache@v4
id: app-cache
with:
path: ./spec/decidim_dummy_app/
Expand All @@ -83,7 +78,7 @@ jobs:
name: Create the screenshots folder
shell: "bash"

- run: bundle exec rails assets:precompile
- run: bundle exec rails shakapacker:compile
name: Precompile assets
working-directory: ./spec/decidim_dummy_app/
shell: "bash"
Expand All @@ -92,14 +87,14 @@ jobs:

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

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

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

strategy:
Expand All @@ -119,7 +114,7 @@ jobs:

services:
postgres:
image: postgres:11
image: postgres:14
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
Expand All @@ -128,6 +123,13 @@ jobs:
--health-retries 5
env:
POSTGRES_PASSWORD: postgres
redis:
image: redis
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5

steps:
- uses: actions/checkout@v4
Expand All @@ -139,11 +141,11 @@ jobs:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

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

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

Expand All @@ -156,17 +158,21 @@ jobs:

- name: General RSpec with config vars ${{ matrix.features }}
run: |
sudo Xvfb -ac $DISPLAY -screen 0 1920x1084x24 > /dev/null 2>&1 & # optional
sudo Xvfb -ac $DISPLAY -screen 0 1920x1084x24 > /dev/null 2>&1 &
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: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./spec/decidim_dummy_app/tmp/screenshots
if-no-files-found: ignore
overwrite: true
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.1.1"
RUN cd && /home/gitpod/.rvm/bin/rvm install "ruby-3.2.2"
4 changes: 2 additions & 2 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ image:

tasks:
- name: dev
before: rvm --default use "ruby-3.0.5"
before: rvm --default use "ruby-3.2.2"
init: bundle install && yarn install && bundle exec rake test_app
command: bundle exec rspec
#- name: webpacker
Expand All @@ -14,4 +14,4 @@ vscode:
- dbaeumer.vscode-eslint
- eamodio.gitlens
- akamud.vscode-theme-onedark
- rebornix.ruby
- rebornix.ruby
11 changes: 7 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ CHANGELOG
Current
-------
Compatibility:
- Decidim v0.28.x
- Decidim v0.29.x

Features:
- Added user time zones in account settings
v0.12.0
-------
Compatibility:
- Decidim v0.29.x

v0.11.2
-------
Expand All @@ -18,6 +20,7 @@ Compatibility:
Features:
- SQL vulnerability fix for admin accountability
- Private fields proposal draft update fix
- Added user time zones in account settings

v0.11.1
------
Expand Down Expand Up @@ -98,7 +101,7 @@ Compatibility:

Features:
- Fixes for the menu hacker

v0.9.1
------

Expand Down
10 changes: 4 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = "0.28.4"
DECIDIM_VERSION = "0.29.1"

gem "decidim", DECIDIM_VERSION
# this causes failures if not enabled (check if still necessary in the future)
Expand All @@ -20,17 +20,15 @@ group :development, :test do

gem "decidim-dev", DECIDIM_VERSION

gem "brakeman", "~> 5.4"
gem "net-imap", "~> 0.2.3"
gem "net-pop", "~> 0.1.1"
gem "brakeman", "~> 6.1"
gem "net-imap", "~> 0.4.16"
gem "net-pop", "~> 0.1.2"
gem "net-smtp", "~> 0.3.1"
gem "parallel_tests", "~> 4.2"
end

group :development do
gem "letter_opener_web", "~> 2.0"
gem "listen", "~> 3.1"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "web-console", "~> 4.2"
end
Loading
Loading