diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4042c9b..fbd5abd 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,18 +13,14 @@ jobs: matrix: ruby: - "2.7.8" - rust: - - "nightly" steps: - uses: actions/checkout@v3 - name: Set up Ruby & Rust - uses: oxidize-rb/actions/setup-ruby-and-rust@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - rustup-toolchain: ${{ matrix.rust }} bundler-cache: true - cargo-cache: true rubygems: "3.4.14" - name: Build yard docs run: YARD_OUTPUT_DIR="${{ runner.temp }}/doc/" bundle exec rake yard diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4db194c..0cba621 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: ruby: - '2.7.8' rust: - - "nightly" + - "1.72.1" steps: - uses: actions/checkout@v3 diff --git a/.gitignore b/.gitignore index 7d17e37..c54b13c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,3 @@ target/ .rspec_status .idea/ .rake_tasks~ -xml2json.json diff --git a/.yardopts b/.yardopts deleted file mode 100644 index d44bc5b..0000000 --- a/.yardopts +++ /dev/null @@ -1 +0,0 @@ ---plugin rustdoc diff --git a/Gemfile.lock b/Gemfile.lock index eab14b4..a6021bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,6 @@ PATH rspec (~> 3.0) rubocop (~> 1.21) yard - yard-rustdoc GEM remote: https://rubygems.org/ @@ -30,7 +29,6 @@ GEM parser (3.2.2.3) ast (~> 2.4.1) racc - prettier_print (1.2.1) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -78,14 +76,9 @@ GEM rubocop-ast (1.29.0) parser (>= 3.2.1.0) ruby-progressbar (1.13.0) - syntax_tree (5.3.0) - prettier_print (>= 1.2.0) unicode-display_width (2.4.2) webrick (1.8.1) yard (0.9.34) - yard-rustdoc (0.3.2) - syntax_tree (~> 5.0) - yard (~> 0.9) PLATFORMS x86_64-linux diff --git a/Rakefile b/Rakefile index b25734b..6b70ef3 100644 --- a/Rakefile +++ b/Rakefile @@ -27,19 +27,9 @@ end require "yard" -file "xml2json.json" do - sh <<~SH - cargo +nightly rustdoc --manifest-path ext/xml2json/Cargo.toml -- \ - -Z unstable-options --output-format json --document-private-items && \ - cp target/doc/xml2json.json . - SH -end - YARD::Rake::YardocTask.new do |t| # t.files = gemspec.files.select { |f| %w[.rb .json].include? File.extname(f) } t.options += ["--output-dir", ENV["YARD_OUTPUT_DIR"]] if ENV["YARD_OUTPUT_DIR"] end -task yard: "xml2json.json" - task default: %i[compile spec clippy rubocop yard] diff --git a/xml2json.gemspec b/xml2json.gemspec index bcb202e..75aa512 100644 --- a/xml2json.gemspec +++ b/xml2json.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.files = [ # .rb - to exclude lib/xml2json/xml2json.so *Dir["ext/**/*"], *Dir["lib/**/*.rb"], *Dir["sig/**/*"], - "Cargo.lock", "Cargo.toml", "xml2json.json" + "Cargo.lock", "Cargo.toml" ].reject { |f| File.directory?(f) } spec.bindir = "exe" spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) } @@ -50,8 +50,6 @@ Gem::Specification.new do |spec| spec.add_dependency "rubocop", "~> 1.21" - spec.add_dependency "yard-rustdoc" - spec.add_dependency "pry" spec.add_dependency "pry-byebug" spec.add_dependency "yard"