Skip to content

Commit 8db0b6d

Browse files
committed
fix CI
1 parent 633d0cd commit 8db0b6d

File tree

4 files changed

+20
-32
lines changed

4 files changed

+20
-32
lines changed

.github/workflows/lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ env:
1313
jobs:
1414
lint:
1515
name: Lint code
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1717
if: "!startsWith(github.head_ref, 'chore/l10n')"
1818
steps:
19-
- uses: actions/checkout@v2.0.0
19+
- uses: actions/checkout@v3
2020
with:
2121
fetch-depth: 1
2222

@@ -25,7 +25,7 @@ jobs:
2525
ruby-version: ${{ env.RUBY_VERSION }}
2626
bundler-cache: true
2727

28-
- uses: actions/setup-node@master
28+
- uses: actions/setup-node@v3
2929
with:
3030
node-version: ${{ env.NODE_VERSION }}
3131

.github/workflows/test.yml

+12-25
Original file line numberDiff line numberDiff line change
@@ -14,55 +14,42 @@ jobs:
1414
test:
1515
name: Test
1616
runs-on: ubuntu-latest
17+
if: "!startsWith(github.head_ref, 'chore/l10n')"
18+
timeout-minutes: 60
19+
env:
20+
DATABASE_USERNAME: postgres
21+
DATABASE_PASSWORD: postgres
22+
DATABASE_HOST: localhost
1723
services:
1824
postgres:
19-
image: postgres:11
25+
image: postgres:14
2026
ports: ["5432:5432"]
2127
options: >-
2228
--health-cmd pg_isready
2329
--health-interval 10s
2430
--health-timeout 5s
2531
--health-retries 5
2632
env:
27-
POSTGRES_PASSWORD: postgres
28-
redis:
29-
image: redis:3.2-alpine
30-
ports: ["6379:6379"]
31-
env:
32-
DATABASE_USERNAME: postgres
33-
DATABASE_PASSWORD: postgres
34-
DATABASE_HOST: localhost
33+
DATABASE_PASSWORD: postgres
3534

3635
steps:
37-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v3
3837
with:
3938
fetch-depth: 1
4039

4140
- name: Install GraphicsMagick
4241
run: sudo apt-get update && sudo apt-get install -y graphicsmagick
4342

44-
- uses: nanasess/setup-chromedriver@v2
45-
with:
46-
chromedriver-version: 119.0.6045.105
47-
48-
- name: List Chrome
49-
run: apt list --installed | grep chrome
50-
51-
- name: Remove Chrome
52-
run: sudo apt remove google-chrome-stable
53-
54-
- uses: browser-actions/setup-chrome@v1
55-
with:
56-
chrome-version: 119.0.6045.105
57-
5843
- uses: ruby/setup-ruby@v1
5944
with:
6045
ruby-version: ${{ env.RUBY_VERSION }}
6146
bundler-cache: true
6247

63-
- uses: actions/setup-node@master
48+
- uses: actions/setup-node@v3
6449
with:
6550
node-version: ${{ env.NODE_VERSION }}
51+
cache: 'npm'
52+
cache-dependency-path: ./package-lock.json
6653

6754
- name: Setup & create Database
6855
run: |

Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ GEM
616616
activesupport (>= 5.0.0)
617617
minitest
618618
nokogiri (>= 1.6)
619-
rails-html-sanitizer (1.6.2)
619+
rails-html-sanitizer (1.6.0)
620620
loofah (~> 2.21)
621621
nokogiri (~> 1.14)
622622
rails-i18n (6.0.0)

app/cells/decidim/budgets/project_vote_button/show.erb

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
budget_order_line_item_path(model.budget, project_id: model),
33
method: vote_button_method,
44
remote: true,
5-
class: "button large budget-list__action #{vote_button_class} getxo-budget-vote-button",
5+
class: "button w-full #{vote_button_classes} getxo-budget-vote-button",
66
id: "project-vote-button-#{model.id}",
77
data: {
88
add: !resource_added?,
@@ -15,11 +15,12 @@
1515
title: vote_button_label do %>
1616
<% if resource_added? %>
1717
<% if model.budget.settings.disable_custom_budgets %>
18-
<%= icon("x", class: "icon--small", aria_label: vote_button_label, role: "img") %>
18+
<%= t("added", scope: "decidim.budgets.projects.project_budget_button") %>
19+
<%= icon "checkbox-circle-line", class: "inline-block" %>
1920
<% else %>
2021
<%= current_order.score_for(model) %>
2122
<% end %>
2223
<% else %>
23-
<%= icon("check", class: "icon--small", aria_label: vote_button_label, role: "img") %>
24+
<%= icon "add-fill", class: "inline-block" %>
2425
<% end %>
2526
<% end %>

0 commit comments

Comments
 (0)