Skip to content

Commit

Permalink
Merge branch 'readme_update'
Browse files Browse the repository at this point in the history
  • Loading branch information
Agnieszka Figiel committed Nov 14, 2023
2 parents 3813e9e + 00a7f83 commit 53aeb4e
Show file tree
Hide file tree
Showing 50 changed files with 640 additions and 318 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/auto_deploy_demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run:
working-directory: ./frontend
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3.1.0
with:
Expand All @@ -51,7 +51,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand All @@ -135,7 +135,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install ruby + gems 💎
uses: ruby/setup-ruby@v1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/auto_deploy_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run:
working-directory: ./frontend
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3.1.0
with:
Expand All @@ -51,7 +51,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install PostgreSQL client 🐘
run: |
sudo apt update
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand All @@ -129,7 +129,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/back_end_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:

steps:
- name: Checkout️ 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install ruby + gems 💎
uses: ruby/setup-ruby@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy_production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run:
working-directory: ./frontend
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3.1.0
with:
Expand All @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install PostgreSQL client 🐘
run: |
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
run: bundle exec rake db:doc:html

- name: Publish to https://vizzuality.github.io/trase/db/all_tables 🚀
uses: JamesIves/github-pages-deploy-action@v4.4.2
uses: JamesIves/github-pages-deploy-action@v4.4.3
with:
branch: gh-pages # The branch the action should deploy to.
folder: doc/gh-pages # The folder the action should deploy.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/front_end_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
run:
working-directory: ./frontend
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node
uses: actions/setup-node@v3.1.0
with:
Expand All @@ -31,7 +31,7 @@ jobs:
run:
working-directory: ./frontend
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
with:
Expand Down
14 changes: 6 additions & 8 deletions .standard_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ ignore:
- Layout/ArgumentAlignment
- app/admin/api/v3/recolor_by_attribute.rb:
- Layout/ArgumentAlignment
- app/admin/api/v3/resize_by_attribute.rb:
- Layout/ArgumentAlignment
- Layout/DotPosition
- app/admin/api/v3/sankey_card_link.rb:
- Layout/ArgumentAlignment
- app/admin/api/v3/top_profile.rb:
Expand Down Expand Up @@ -273,9 +270,6 @@ ignore:
- app/models/api/v3/recolor_by_attribute.rb:
- Style/PercentLiteralDelimiters
- Layout/ArgumentAlignment
- app/models/api/v3/resize_by_attribute.rb:
- Layout/ArgumentAlignment
- Layout/DotPosition
- app/models/api/v3/sankey_card_link.rb:
- Layout/DotPosition
- Layout/LineContinuationSpacing
Expand Down Expand Up @@ -357,8 +351,6 @@ ignore:
- Layout/ArgumentAlignment
- app/serializers/api/v3/contexts/recolor_by_attribute_serializer.rb:
- Layout/ArgumentAlignment
- app/serializers/api/v3/contexts/resize_by_attribute_serializer.rb:
- Layout/ArgumentAlignment
- app/serializers/api/v3/dashboards/template_serializer.rb:
- Layout/ArgumentAlignment
- app/serializers/api/v3/download_attribute_serializer.rb:
Expand Down Expand Up @@ -435,6 +427,8 @@ ignore:
- Style/HashConversion
- app/services/api/v3/countries_com_trade_indicators/country_codes.rb:
- Style/HashConversion
- app/services/api/v3/countries_com_trade_indicators/importer_service.rb:
- Style/UnlessLogicalOperators
- app/services/api/v3/countries_com_trade_indicators/world_request.rb:
- Style/RedundantReturn
- app/services/api/v3/countries_com_trade_indicators/world_request_uri_queue.rb:
Expand All @@ -444,11 +438,14 @@ ignore:
- app/services/api/v3/countries_wb_indicators/api_service.rb:
- Layout/SpaceAfterComma
- Lint/UselessAssignment
- app/services/api/v3/countries_wb_indicators/importer_service.rb:
- Style/UnlessLogicalOperators
- app/services/api/v3/countries_wb_indicators/wb_request.rb:
- Layout/DotPosition
- app/services/api/v3/country_profiles/basic_attributes.rb:
- Layout/DotPosition
- Style/PercentLiteralDelimiters
- Style/UnlessLogicalOperators
- app/services/api/v3/country_profiles/commodity_totals.rb:
- Layout/DotPosition
- app/services/api/v3/country_profiles/external_attribute_value.rb:
Expand Down Expand Up @@ -640,6 +637,7 @@ ignore:
- Layout/IndentationConsistency
- Layout/SpaceBeforeBlockBraces
- Performance/RegexpMatch
- Style/UnlessLogicalOperators
- app/services/api/v3/sankey_card_links/query_params.rb:
- Naming/BinaryOperatorParameterName
- Style/ConditionalAssignment
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "rails", "~> 6.1.7"
# Use pg as the database for Active Record
gem "pg"
# Use Puma as the app server
gem "puma", "~> 6.3"
gem "puma", "~> 6.4"
# Use SCSS for stylesheets
gem "sass-rails", ">= 6"
# Use CoffeeScript for .coffee assets and views
Expand Down
Loading

0 comments on commit 53aeb4e

Please sign in to comment.