From bf355a1faaa476b92a3ebd450384a9c19e074d29 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 6 Jun 2021 13:05:30 -0400 Subject: [PATCH] dev: remove concourse pipelines and dev dependency --- .gitignore | 1 - README.md | 3 +- Rakefile | 6 -- concourse/common_prelude.rb | 7 -- concourse/common_resources.yml | 7 -- concourse/loofah-pr.yml | 78 -------------- concourse/loofah-pr.yml.generated | 163 ------------------------------ concourse/loofah.yml | 56 ---------- concourse/loofah.yml.generated | 114 --------------------- concourse/tasks/rake-test/run.ps1 | 9 -- concourse/tasks/rake-test/run.sh | 14 --- loofah.gemspec | 11 +- 12 files changed, 6 insertions(+), 463 deletions(-) delete mode 100644 concourse/common_prelude.rb delete mode 100644 concourse/common_resources.yml delete mode 100644 concourse/loofah-pr.yml delete mode 100644 concourse/loofah-pr.yml.generated delete mode 100644 concourse/loofah.yml delete mode 100644 concourse/loofah.yml.generated delete mode 100644 concourse/tasks/rake-test/run.ps1 delete mode 100755 concourse/tasks/rake-test/run.sh diff --git a/.gitignore b/.gitignore index 1f8a962a..2b0c6143 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ pkg tmp Gemfile.lock .bundle -concourse/private.yml diff --git a/README.md b/README.md index 236c509d..a27dbe8f 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ ## Status -[![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/loofah/jobs/ruby-3.0/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/loofah) -[![Code Climate](https://codeclimate.com/github/flavorjones/loofah.svg)](https://codeclimate.com/github/flavorjones/loofah) +[![ci](https://github.com/flavorjones/loofah/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/flavorjones/loofah/actions/workflows/ci.yml) [![Tidelift dependencies](https://tidelift.com/badges/package/rubygems/loofah)](https://tidelift.com/subscription/pkg/rubygems-loofah?utm_source=rubygems-loofah&utm_medium=referral&utm_campaign=readme) diff --git a/Rakefile b/Rakefile index 90b20653..27303d3a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,12 +1,6 @@ require "hoe/markdown" Hoe::Markdown::Standalone.new("loofah").define_markdown_tasks -require "concourse" -Concourse.new("loofah", fly_target: "ci") do |c| - c.add_pipeline "loofah", "loofah.yml" - c.add_pipeline "loofah-pr", "loofah-pr.yml" -end - require "rake/testtask" Rake::TestTask.new do |t| t.libs << "test" diff --git a/concourse/common_prelude.rb b/concourse/common_prelude.rb deleted file mode 100644 index ac988e20..00000000 --- a/concourse/common_prelude.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "json" - -$common_ignore_paths = [ - "CHANGELOG.md", - "README.md", - "concourse/**", -].to_json diff --git a/concourse/common_resources.yml b/concourse/common_resources.yml deleted file mode 100644 index 91209052..00000000 --- a/concourse/common_resources.yml +++ /dev/null @@ -1,7 +0,0 @@ - - name: ci - type: git - icon: "cog" - source: - uri: https://github.com/flavorjones/loofah/ - branch: main - disable_ci_skip: true # always get the latest pipeline configuration diff --git a/concourse/loofah-pr.yml b/concourse/loofah-pr.yml deleted file mode 100644 index 8768fc67..00000000 --- a/concourse/loofah-pr.yml +++ /dev/null @@ -1,78 +0,0 @@ -% require "common_prelude.rb" - -resource_types: -- name: pull-request - type: registry-image - source: - repository: teliaoss/github-pr-resource - -resources: -<%= erbify_file "common_resources.yml" -%> - - name: loofah-pr - type: pull-request - icon: github - check_every: 15m - # https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/loofah-pr/resources/loofah-pr/check/webhook?webhook_token=((webhook_token)) - webhook_token: ((loofah-pr-webhook-token)) - source: - repository: flavorjones/loofah - access_token: ((github-repo-status-access-token)) - ignore_paths: <%= $common_ignore_paths %> - -jobs: - - name: pr-pending - public: true - plan: - - get: loofah-pr - trigger: true - version: every - - put: loofah-pr - params: - path: loofah-pr - status: PENDING - - - name: pr-success - public: true - disable_manual_trigger: true - plan: - - get: loofah-pr - trigger: true - version: every - passed: -% RUBIES[:mri].each do |ruby_version| - - ruby-<%= ruby_version %>-pr -% end - - put: loofah-pr - params: - path: loofah-pr - status: SUCCESS - -% RUBIES[:mri].each do |ruby_version| - - name: ruby-<%= ruby_version %>-pr - public: true - plan: - - get: ci - - get: loofah-pr - trigger: true - version: every - passed: [pr-pending] - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "<%= ruby_version %>"} - platform: linux - inputs: - - name: ci - - name: loofah-pr - path: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - on_failure: - put: loofah-pr - params: - path: loofah-pr - status: FAILURE -% end diff --git a/concourse/loofah-pr.yml.generated b/concourse/loofah-pr.yml.generated deleted file mode 100644 index 4c54405f..00000000 --- a/concourse/loofah-pr.yml.generated +++ /dev/null @@ -1,163 +0,0 @@ - -resource_types: -- name: pull-request - type: registry-image - source: - repository: teliaoss/github-pr-resource - -resources: - - name: ci - type: git - icon: "cog" - source: - uri: https://github.com/flavorjones/loofah/ - branch: main - disable_ci_skip: true # always get the latest pipeline configuration - - name: loofah-pr - type: pull-request - icon: github - check_every: 15m - # https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/loofah-pr/resources/loofah-pr/check/webhook?webhook_token=((webhook_token)) - webhook_token: ((loofah-pr-webhook-token)) - source: - repository: flavorjones/loofah - access_token: ((github-repo-status-access-token)) - ignore_paths: ["CHANGELOG.md","README.md","concourse/**"] - -jobs: - - name: pr-pending - public: true - plan: - - get: loofah-pr - trigger: true - version: every - - put: loofah-pr - params: - path: loofah-pr - status: PENDING - - - name: pr-success - public: true - disable_manual_trigger: true - plan: - - get: loofah-pr - trigger: true - version: every - passed: - - ruby-2.5-pr - - ruby-2.6-pr - - ruby-2.7-pr - - ruby-3.0-pr - - put: loofah-pr - params: - path: loofah-pr - status: SUCCESS - - - name: ruby-2.5-pr - public: true - plan: - - get: ci - - get: loofah-pr - trigger: true - version: every - passed: [pr-pending] - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "2.5"} - platform: linux - inputs: - - name: ci - - name: loofah-pr - path: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - on_failure: - put: loofah-pr - params: - path: loofah-pr - status: FAILURE - - name: ruby-2.6-pr - public: true - plan: - - get: ci - - get: loofah-pr - trigger: true - version: every - passed: [pr-pending] - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "2.6"} - platform: linux - inputs: - - name: ci - - name: loofah-pr - path: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - on_failure: - put: loofah-pr - params: - path: loofah-pr - status: FAILURE - - name: ruby-2.7-pr - public: true - plan: - - get: ci - - get: loofah-pr - trigger: true - version: every - passed: [pr-pending] - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "2.7"} - platform: linux - inputs: - - name: ci - - name: loofah-pr - path: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - on_failure: - put: loofah-pr - params: - path: loofah-pr - status: FAILURE - - name: ruby-3.0-pr - public: true - plan: - - get: ci - - get: loofah-pr - trigger: true - version: every - passed: [pr-pending] - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "3.0"} - platform: linux - inputs: - - name: ci - - name: loofah-pr - path: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - on_failure: - put: loofah-pr - params: - path: loofah-pr - status: FAILURE diff --git a/concourse/loofah.yml b/concourse/loofah.yml deleted file mode 100644 index cbdf272a..00000000 --- a/concourse/loofah.yml +++ /dev/null @@ -1,56 +0,0 @@ -% require "common_prelude.rb" - -resources: -<%= erbify_file "common_resources.yml" -%> - - name: loofah - type: git - icon: "github" - source: - uri: https://github.com/flavorjones/loofah/ - branch: main - ignore_paths: <%= $common_ignore_paths %> - -jobs: -% RUBIES[:mri].each do |ruby_version| - - name: ruby-<%= ruby_version %> - public: true - plan: - - get: ci - - get: loofah - trigger: true - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "<%= ruby_version %>"} - platform: linux - inputs: - - name: ci - - name: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh -% end - -% RUBIES[:jruby].each do |jruby_version| - - name: jruby-<%= jruby_version %> - public: true - plan: - - get: ci - - get: loofah - trigger: true - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: jruby, tag: "<%= jruby_version %>-jdk"} - platform: linux - inputs: - - name: ci - - name: loofah - params: - JAVA_OPTS: "-Dfile.encoding=UTF8" # https://github.com/docker-library/openjdk/issues/32 - run: - path: ci/concourse/tasks/rake-test/run.sh -% end diff --git a/concourse/loofah.yml.generated b/concourse/loofah.yml.generated deleted file mode 100644 index 7c8c0c5b..00000000 --- a/concourse/loofah.yml.generated +++ /dev/null @@ -1,114 +0,0 @@ - -resources: - - name: ci - type: git - icon: "cog" - source: - uri: https://github.com/flavorjones/loofah/ - branch: main - disable_ci_skip: true # always get the latest pipeline configuration - - name: loofah - type: git - icon: "github" - source: - uri: https://github.com/flavorjones/loofah/ - branch: main - ignore_paths: ["CHANGELOG.md","README.md","concourse/**"] - -jobs: - - name: ruby-2.5 - public: true - plan: - - get: ci - - get: loofah - trigger: true - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "2.5"} - platform: linux - inputs: - - name: ci - - name: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - - name: ruby-2.6 - public: true - plan: - - get: ci - - get: loofah - trigger: true - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "2.6"} - platform: linux - inputs: - - name: ci - - name: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - - name: ruby-2.7 - public: true - plan: - - get: ci - - get: loofah - trigger: true - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "2.7"} - platform: linux - inputs: - - name: ci - - name: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - - name: ruby-3.0 - public: true - plan: - - get: ci - - get: loofah - trigger: true - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: ruby, tag: "3.0"} - platform: linux - inputs: - - name: ci - - name: loofah - params: - NOKOGIRI_USE_SYSTEM_LIBRARIES: t - run: - path: ci/concourse/tasks/rake-test/run.sh - - - name: jruby-9.2 - public: true - plan: - - get: ci - - get: loofah - trigger: true - - task: rake-test - config: - image_resource: - type: registry-image - source: {repository: jruby, tag: "9.2-jdk"} - platform: linux - inputs: - - name: ci - - name: loofah - params: - JAVA_OPTS: "-Dfile.encoding=UTF8" # https://github.com/docker-library/openjdk/issues/32 - run: - path: ci/concourse/tasks/rake-test/run.sh diff --git a/concourse/tasks/rake-test/run.ps1 b/concourse/tasks/rake-test/run.ps1 deleted file mode 100644 index e03f1683..00000000 --- a/concourse/tasks/rake-test/run.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -. "c:\var\vcap\packages\windows-ruby-dev-tools\prelude.ps1" - -push-location loofah - - system-cmd "gem install bundler" - system-cmd "bundle install" - system-cmd "bundle exec rake test" - -pop-location diff --git a/concourse/tasks/rake-test/run.sh b/concourse/tasks/rake-test/run.sh deleted file mode 100755 index 3d784474..00000000 --- a/concourse/tasks/rake-test/run.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /usr/bin/env bash - -set -e -x -u - -pushd loofah - - bundle install - - # TODO: remove this once fefc629 (2019-11-25) is far enough in the past - export RUBYOPT="--enable-frozen-string-literal --debug=frozen-string-literal" - - bundle exec rake - -popd diff --git a/loofah.gemspec b/loofah.gemspec index a900264a..83518535 100644 --- a/loofah.gemspec +++ b/loofah.gemspec @@ -31,15 +31,14 @@ Gem::Specification.new do |spec| ] + Dir.glob("lib/**/*.*") end - spec.add_runtime_dependency("nokogiri", [">= 1.5.9"]) spec.add_runtime_dependency("crass", ["~> 1.0.2"]) + spec.add_runtime_dependency("nokogiri", [">= 1.5.9"]) - spec.add_development_dependency("rake", ["~> 13.0"]) + spec.add_development_dependency("hoe-markdown", ["~> 1.3"]) + spec.add_development_dependency("json", ["~> 2.2"]) spec.add_development_dependency("minitest", ["~> 5.14"]) + spec.add_development_dependency("rake", ["~> 13.0"]) + spec.add_development_dependency("rdoc", [">= 4.0", "< 7"]) spec.add_development_dependency("rr", ["~> 1.2.0"]) - spec.add_development_dependency("json", ["~> 2.2"]) - spec.add_development_dependency("concourse", ["~> 0.33"]) spec.add_development_dependency("rubocop", "~> 1.1") - spec.add_development_dependency("rdoc", [">= 4.0", "< 7"]) - spec.add_development_dependency("hoe-markdown", ["~> 1.3"]) end