diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index dc89bb31..fd358e59 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -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 }} @@ -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 }} @@ -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 }} diff --git a/Makefile b/Makefile index 69259cec..c926659e 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/app/packs/src/decidim/decidim_application.js b/app/packs/src/decidim/decidim_application.js index 8ad5beb0..df19a818 100644 --- a/app/packs/src/decidim/decidim_application.js +++ b/app/packs/src/decidim/decidim_application.js @@ -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) diff --git a/app/packs/src/decidim/disable_pwa_prompt.js b/app/packs/src/decidim/disable_pwa_prompt.js new file mode 100644 index 00000000..0a02b539 --- /dev/null +++ b/app/packs/src/decidim/disable_pwa_prompt.js @@ -0,0 +1,6 @@ +// disable the prompt for pwa +(() => { + if (localStorage.getItem("pwaInstallPromptSeen") !== 'true') { + localStorage.setItem("pwaInstallPromptSeen", true); + } +})();