Skip to content

Commit

Permalink
fix: resolve issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jmuelbert committed Apr 26, 2023
1 parent c9671de commit 6ad4b28
Show file tree
Hide file tree
Showing 8 changed files with 286 additions and 641 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ end_of_line = crlf

[*.{md,markdown,js.snap}]
trim_trailing_whitespace = false
max_line_lenght = 180
max_line_length = 180

[LICENSE]
insert_final_newline = false
87 changes: 0 additions & 87 deletions .github/workflows/setup-homebrew.yml

This file was deleted.

8 changes: 5 additions & 3 deletions Formula/qtifw.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ class Qtifw < Formula

head "https://code.qt.io/cgit/installer-framework/installer-framework.git/"

depends_on "qt@5" => :build
depends_on "qt@5"
depends_on "xz" => :build

tool_version = "4.5.1"
version = "4.5.1"

def install
Dir.glob("**/*.pro") do |f|
Expand All @@ -30,6 +30,8 @@ def install
build_and_install_qt_ifw
end

private

def inreplace_qt_ifw_pro(file_path)
inreplace file_path do |s|
s.gsub!("$$[QT_INSTALL_LIBS]", "$${PREFIX}/lib", false)
Expand Down Expand Up @@ -58,6 +60,6 @@ def qt_ifw_build_args
end

test do
assert_match "archivegen #{tool_version}", shell_output("#{bin}/archivegen --version").chomp
assert_match "archivegen #{version}", shell_output("#{bin}/archivegen --version").chomp
end
end
10 changes: 1 addition & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

[![Gitpod-Ready-Code][gitpod_badge]][gitpod]
[![CI][ci_action_badge]][ci_action]
[![AppVeyor Build][appveyor_badge]][appveyor]
[![Dependabot auto-merge][dependabot_action_badge]][depandabot_action]
[![Dependency Review][dependency_review_action_badge]][dependency_review_action]
[![Deploy Astro site to Pages][ghpages_action_badge]][ghpages_action]
Expand Down Expand Up @@ -57,11 +56,9 @@ Please checkout [Issues][github_issues] page for a list of all known issues.
[![CodeQL][codeql_action_badge]][codeql_action]
[![Sonar Cloud Analysis][sonarcloud_action_badge]][sonarcloud_action]
[![DevSkim][devskim_action_badge]][devskim_action]
[![Rubocop][rubycop_action_badge]][rubycop_action]

## Linter and spell checking

[![MegaLinter][megalinter_action_badge]][megalinter_action]
[![Write good][writegood_action_badge]][writegood_action]

## Open source compatibility check
Expand All @@ -82,16 +79,12 @@ Code is under the [European Public License V1.2][license].
[writegood_action]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/write-good.yml
[sonarcloud_action_badge]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/sonarcloud-analysis.yml/badge.svg
[sonarcloud_action]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/sonarcloud-analysis.yml
[rubycop_action_badge]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/rubocop.yml/badge.svg
[rubycop_action]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/rubocop.yml
[codacy_action_badge]: https://app.codacy.com/project/badge/Grade/5540e367f8564b249334da47b20a6953
[codacy_action]: https://app.codacy.com/gh/jmuelbert/homebrew-qtifw/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade
[codeql_action_badge]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/codeql-analysis.yml/badge.svg
[codeql_action]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/codeql-analysis.yml
[devskim_action_badge]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/devskim-analysis.yml/badge.svg
[devskim_action]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/devskim-analysis.yml
[megalinter_action_badge]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/mega-linter.yml/badge.svg
[megalinter_action]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/mega-linter.yml
[reuse_compliance_action_badge]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/reuse-check.yml/badge.svg
[reuse_compliance_action]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/reuse-check.yml
[gitpod_badge]: https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod
Expand All @@ -110,5 +103,4 @@ Code is under the [European Public License V1.2][license].
[ghpages_action]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/pages-astro.yml
[ghpages_action_badge]: https://github.com/jmuelbert/homebrew-qtifw/actions/workflows/pages-astro.yml/badge.svg
[qtinstallerframework_manual]: https://doc.qt.io/qtinstallerframework
[appveyor_badge]: https://ci.appveyor.com/api/projects/status/gf2yofmw6onqt306/branch/main?svg=true
[appveyor]: https://ci.appveyor.com/project/jmuelbert/homebrew-qtifw/branch/main

1 change: 0 additions & 1 deletion VERSION

This file was deleted.

20 changes: 10 additions & 10 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"@algolia/client-search": "^4.17.0",
"@astrojs/preact": "^2.1.0",
"@astrojs/react": "^2.1.1",
"@docsearch/css": "^3.3.3",
"@docsearch/react": "^3.3.3",
"@types/node": "^18.15.11",
"@types/react": "^18.0.33",
"@types/react-dom": "^18.0.11",
"astro": "^2.2.1",
"@docsearch/css": "^3.3.4",
"@docsearch/react": "^3.3.4",
"@types/node": "^18.16.1",
"@types/react": "^18.2.0",
"@types/react-dom": "^18.2.1",
"astro": "^2.3.1",
"astro-html-minifier": "^0.4.1",
"preact": "^10.13.2",
"react": "^18.2.0",
Expand All @@ -33,11 +33,11 @@
"@astrojs/sitemap": "^1.2.2",
"astro-robots-txt": "^0.5.0",
"html-escaper": "^3.0.3",
"postcss": "^8.4.21",
"postcss": "^8.4.23",
"postcss-html": "^1.5.0",
"prettier": "^2.8.7",
"sass": "^1.61.0",
"stylelint": "^15.4.0",
"prettier": "^2.8.8",
"sass": "^1.62.1",
"stylelint": "^15.6.0",
"stylelint-config-recommended-scss": "^11.0.0",
"stylelint-config-standard": "^33.0.0"
}
Expand Down
Loading

0 comments on commit 6ad4b28

Please sign in to comment.