Skip to content

Commit

Permalink
Update versioning, update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
JoonasAapro committed Dec 21, 2023
1 parent 4a2372d commit 4be9c6f
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 173 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/ci_iframe.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: "[CI] Iframe"
on:
push:
branches:
- develop
- main
- release/*
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
build_app:
name: Build test application
uses: mainio/gha-decidim-module/.github/workflows/build_app.yml@main
secrets: inherit
main:
needs: build_app
name: Tests
uses: mainio/gha-decidim-module/.github/workflows/ci_rspec.yml@main
secrets: inherit
43 changes: 12 additions & 31 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,21 @@
name: "[CI] Lint"

on:
push:
branches:
- develop
- main
- release/*
pull_request:

env:
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
lint-report:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- uses: actions/setup-node@master
with:
node-version: ${{ env.NODE_VERSION }}

- run: npm ci
name: Install JS deps

- run: bundle exec rubocop -P
name: Lint Ruby files

- run: npm run stylelint
name: Lint SCSS files

- run: bundle exec erblint app/**/*.erb
name: Lint ERB files
lint:
name: Lint code
uses: mainio/gha-decidim-module/.github/workflows/lint.yml@main
secrets: inherit
with:
eslint: true
stylelint: true
56 changes: 0 additions & 56 deletions .github/workflows/precompile.yml

This file was deleted.

77 changes: 0 additions & 77 deletions .github/workflows/tests.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ PATH
remote: .
specs:
decidim-iframe (0.10.2)
decidim-admin (>= 0.26.0, < 0.28)
decidim-core (>= 0.26.0, < 0.28)
decidim-admin (~> 0.27.4)
decidim-core (~> 0.27.4)
deface (>= 1.5)
sassc (~> 2.3)

Expand Down
2 changes: 0 additions & 2 deletions app/views/decidim/iframe/iframe/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<%= announcement = render(partial: "decidim/shared/component_announcement") %>

<%= stylesheet_pack_tag "decidim_iframe" %>

<style rel="stylesheet" type="text/css">
<% if remove_margins? %>
<%= ".wrapper { padding-left: 0;padding-right: 0;padding-bottom: 0; }" %>
Expand Down
6 changes: 3 additions & 3 deletions decidim-decidim_awesome.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Gem::Specification.new do |s|

s.files = Dir["{app,config,lib,vendor,db}/**/*", "LICENSE-AGPLv3.txt", "Rakefile", "package.json", "README.md", "CHANGELOG.md"]

s.add_dependency "decidim-admin", Decidim::Iframe::COMPAT_DECIDIM_VERSION
s.add_dependency "decidim-core", Decidim::Iframe::COMPAT_DECIDIM_VERSION
s.add_dependency "decidim-admin", Decidim::Iframe::DECIDIM_VERSION
s.add_dependency "decidim-core", Decidim::Iframe::DECIDIM_VERSION
s.add_dependency "deface", ">= 1.5"
s.add_dependency "sassc", "~> 2.3" # TODO: check if this can be removed

s.add_development_dependency "decidim-dev", Decidim::Iframe::COMPAT_DECIDIM_VERSION
s.add_development_dependency "decidim-dev", Decidim::Iframe::DECIDIM_VERSION
s.metadata["rubygems_mfa_required"] = "true"
end
1 change: 0 additions & 1 deletion lib/decidim/iframe/component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

component.settings(:step) do |settings|
# Add your settings per step
settings.attribute :announcement, type: :text, translated: true, editor: true
settings.attribute :iframe, type: :text, default: ""
end

Expand Down
2 changes: 1 addition & 1 deletion lib/decidim/iframe/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ module Decidim
# This holds the decidim-iframe version.
module Iframe
VERSION = "0.10.2"
COMPAT_DECIDIM_VERSION = [">= 0.26.0", "< 0.28"].freeze
DECIDIM_VERSION = "~> 0.27.4"
end
end

0 comments on commit 4be9c6f

Please sign in to comment.