Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
12 changes: 8 additions & 4 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ jobs:
name: RSpec
- run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH
name: Upload coverage
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./spec/tmp/screenshots
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: assets-manifest-${{ matrix.slice }}
Expand Down Expand Up @@ -136,6 +136,10 @@ jobs:
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true
- run: |
sudo apt update
sudo apt install libu2f-udev imagemagick
name: install libu2f-udev & imagemagick
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
Expand All @@ -158,12 +162,12 @@ jobs:
name: RSpec
- run: ./.github/upload_coverage.sh decidim-app $GITHUB_EVENT_PATH
name: Upload coverage
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: screenshots
path: ./spec/tmp/screenshots
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: assets-manifest-${{ matrix.slice }}
Expand Down
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@ run: up
@make create-seeds

up:
docker-compose -f docker-compose.local.yml up --build -d
docker compose -f docker-compose.local.yml up --build -d
@make setup-database

# Stops containers and remove volumes
teardown:
docker-compose -f docker-compose.local.yml down -v --rmi all
docker compose -f docker-compose.local.yml down -v --rmi all

create-database:
docker-compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:create'
docker compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:create'

setup-database: create-database
docker-compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:migrate'
docker compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:migrate'

# Create seeds
create-seeds:
docker-compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:schema:load db:seed'
docker compose -f docker-compose.local.yml exec app /bin/bash -c 'DISABLE_DATABASE_ENVIRONMENT_CHECK=1 /usr/local/bundle/bin/bundle exec rake db:schema:load db:seed'

# Restore dump
restore-dump:
bundle exec rake restore_dump

shell:
docker-compose -f docker-compose.local.yml exec app /bin/bash
docker compose -f docker-compose.local.yml exec app /bin/bash

restart:
docker-compose -f docker-compose.local.yml up -d
docker compose -f docker-compose.local.yml up -d

rebuild:
docker-compose -f docker-compose.local.yml up --build -d
docker compose -f docker-compose.local.yml up --build -d

status:
docker-compose -f docker-compose.local.yml ps
docker compose -f docker-compose.local.yml ps

logs:
docker-compose -f docker-compose.local.yml logs app
docker compose -f docker-compose.local.yml logs app
1 change: 1 addition & 0 deletions app/packs/src/decidim/decidim_application.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// as part of that pack

import "src/decidim/append_after_action_to_modals"
import "src/decidim/disable_pwa_prompt.js"

// Load images
require.context("../../images", true)
6 changes: 6 additions & 0 deletions app/packs/src/decidim/disable_pwa_prompt.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// disable the prompt for pwa
(() => {
if (localStorage.getItem("pwaInstallPromptSeen") !== 'true') {
localStorage.setItem("pwaInstallPromptSeen", true);
}
})();
Loading