Skip to content

Commit

Permalink
Fix workflows, adapt changes of overridden files, bump version of som…
Browse files Browse the repository at this point in the history
…e dependencies, and uninstall `decidim-valid_auth` module (#564)

* Fix CI

* Fix overrides

* Remove badge of unused module

* Upload screenshots

* Change Gemfile

* Fix rubocop versions

* Bump decidim-decidim_awesome

* Change decidim branch

* Bump decidim version

* Fix tests related to valid_auth module

* Ignore file for codeclimate

* Disable valid_auth module
  • Loading branch information
fblupi authored Oct 23, 2024
1 parent f778abc commit 95320f3
Show file tree
Hide file tree
Showing 13 changed files with 131 additions and 170 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
lint:
name: Lint code
runs-on: ubuntu:22.04
runs-on: ubuntu-22.04
env:
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test
runs-on: ubuntu:22.04
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:11
Expand Down Expand Up @@ -47,3 +47,10 @@ jobs:
mkdir node_modules
bundle exec rspec
name: Run specs
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./tmp/screenshots
if-no-files-found: ignore
overwrite: true
9 changes: 8 additions & 1 deletion .github/workflows/test_census_sms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test Census SMS
runs-on: ubuntu:22-04
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:11
Expand Down Expand Up @@ -47,3 +47,10 @@ jobs:
mkdir node_modules
bundle exec rspec decidim-census_sms
name: Run specs
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./tmp/screenshots
if-no-files-found: ignore
overwrite: true
9 changes: 8 additions & 1 deletion .github/workflows/test_stats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
test:
name: Test Stats
runs-on: ubuntu:22.04
runs-on: ubuntu-22.04
services:
postgres:
image: postgres:11
Expand Down Expand Up @@ -47,3 +47,10 @@ jobs:
mkdir node_modules
bundle exec rspec decidim-stats
name: Run specs
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./tmp/screenshots
if-no-files-found: ignore
overwrite: true
49 changes: 0 additions & 49 deletions .github/workflows/test_valid_auth.yml

This file was deleted.

8 changes: 3 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,22 @@

source "https://rubygems.org"

DECIDIM_VERSION = "0.28.4"
DECIDIM_VERSION = { git: "https://github.com/AjuntamentdeBarcelona/decidim", branch: "release/0.28-stable-bcn" }.freeze

ruby RUBY_VERSION

# gem "decidim", DECIDIM_VERSION
gem "decidim", github: "ajuntamentdeBarcelona/decidim", branch: "bcn/0.28-branch"
gem "decidim", DECIDIM_VERSION
gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-internal_evaluation", github: "AjuntamentdeBarcelona/decidim-internal-evaluation-module", branch: "release/0.28-stable"
gem "decidim-sortitions", DECIDIM_VERSION
gem "decidim-templates", DECIDIM_VERSION

gem "decidim-census_sms", path: "decidim-census_sms"
gem "decidim-dataviz", path: "decidim-dataviz"
gem "decidim-ephemeral_participation", path: "decidim-ephemeral_participation" # Installed but not used anymore
gem "decidim-stats", path: "decidim-stats"
gem "decidim-valid_auth", path: "decidim-valid_auth"

gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome"
gem "decidim-internal_evaluation", git: "https://github.com/AjuntamentdeBarcelona/decidim-internal-evaluation-module", branch: "release/0.28-stable"
gem "decidim-kids", git: "https://github.com/AjuntamentdeBarcelona/decidim-module-kids"
gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer"
Expand Down
Loading

0 comments on commit 95320f3

Please sign in to comment.