Merge branch 'chore/bump-decidim-f3b125243e' into tmp/preprod

AjuntamentdeBarcelona · Nov 14, 2024 · 0428f72 · 0428f72
2 parents 6e7566e + 730333e
commit 0428f72
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,15 +37,15 @@ jobs:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
       - uses: nanasess/setup-chromedriver@v2
+      - run: |
+          sudo apt install wkhtmltopdf
       - run: bundle exec rake db:test:prepare
         name: Setup database
       - name: Precompile assets
         run: |
           npm install
           bundle exec rake assets:precompile
-      - run: |
-          mkdir node_modules
-          bundle exec rspec
+      - run: bundle exec rspec
         name: Run specs
       - uses: actions/upload-artifact@v4
         if: always()

diff --git a/.github/workflows/test_census_sms.yml b/.github/workflows/test_census_sms.yml
@@ -37,15 +37,15 @@ jobs:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
       - uses: nanasess/setup-chromedriver@v2
+      - run: |
+          sudo apt install wkhtmltopdf
       - run: bundle exec rake db:test:prepare
         name: Setup database
       - name: Precompile assets
         run: |
           npm install
           bundle exec rake assets:precompile
-      - run: |
-          mkdir node_modules
-          bundle exec rspec decidim-census_sms
+      - run: bundle exec rspec decidim-census_sms
         name: Run specs
       - uses: actions/upload-artifact@v4
         if: always()

diff --git a/.github/workflows/test_stats.yml b/.github/workflows/test_stats.yml
@@ -37,15 +37,15 @@ jobs:
           ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
       - uses: nanasess/setup-chromedriver@v2
+      - run: |
+          sudo apt install wkhtmltopdf
       - run: bundle exec rake db:test:prepare
         name: Setup database
       - name: Precompile assets
         run: |
           npm install
           bundle exec rake assets:precompile
-      - run: |
-          mkdir node_modules
-          bundle exec rspec decidim-stats
+      - run: bundle exec rspec decidim-stats
         name: Run specs
       - uses: actions/upload-artifact@v4
         if: always()

diff --git a/Gemfile b/Gemfile
@@ -25,7 +25,6 @@ gem "decidim-vocdoni", git: "https://github.com/decidim-vocdoni/decidim-module-v
 
 gem "origami"
 gem "wicked_pdf", "< 2.8"
-gem "wkhtmltopdf-binary"
 
 gem "progressbar"
 gem "puma"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/AjuntamentdeBarcelona/decidim
-  revision: 4bfc73be0724b60918f93867ae0a03d662aea1fd
+  revision: f3b125243e409476b07c75a7438eafc529dd96c8
   branch: release/0.28-stable-bcn
   specs:
     decidim (0.28.4)
@@ -136,7 +136,6 @@ GIT
     decidim-forms (0.28.4)
       decidim-core (= 0.28.4)
       wicked_pdf (~> 2.1)
-      wkhtmltopdf-binary (~> 0.12)
     decidim-generators (0.28.4)
       decidim-core (= 0.28.4)
     decidim-initiatives (0.28.4)
@@ -146,7 +145,6 @@ GIT
       decidim-verifications (= 0.28.4)
       hexapdf (~> 0.32.0)
       wicked_pdf (~> 2.1)
-      wkhtmltopdf-binary (~> 0.12)
     decidim-meetings (0.28.4)
       decidim-core (= 0.28.4)
       decidim-forms (= 0.28.4)
@@ -978,7 +976,6 @@ GEM
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.6.18)
@@ -1041,7 +1038,6 @@ DEPENDENCIES
   stackprof
   web-console
   wicked_pdf (< 2.8)
-  wkhtmltopdf-binary
 
 RUBY VERSION
    ruby 3.1.1p18

diff --git a/Rakefile b/Rakefile
@@ -116,7 +116,3 @@ namespace :decidim_surveys_patch do
     end
   end
 end
-
-Rake::Task["assets:precompile"].enhance do
-  FileUtils.remove_dir("node_modules", true)
-end
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,7 +116,3 @@ namespace :decidim_surveys_patch do @@
         end
       end
     end
-    Rake::Task["assets:precompile"].enhance do
-      FileUtils.remove_dir("node_modules", true)
-    end