Merge pull request #569 from issyl0/unseparate-linux-formulae

Migrate Linux data source to Homebrew/homebrew-core

.github/workflows/tests.yml

@@ -31,4 +31,4 @@ jobs:
           bundle install --jobs 4 --retry 3
 
       - name: Generate site
-        run: bundle exec rake all_formulae cask
+        run: bundle exec rake formulae cask

README.md

@@ -2,7 +2,7 @@
 
 [Homebrew Formulae](https://formulae.brew.sh) is an online package browser for [Homebrew](https://brew.sh).
 
-It displays all packages in the [Homebrew/homebrew-core](https://github.com/Homebrew/homebrew-core), [Homebrew/homebrew-cask](https://github.com/Homebrew/homebrew-cask) and [Homebrew/linuxbrew-core](https://github.com/Homebrew/linuxbrew-core) taps. A [GitHub Action](https://github.com/Homebrew/formulae.brew.sh/blob/master/.github/workflows/scheduled.yml) is run periodically which pulls changes from each tap and deploys the site to GitHub Pages.
+It displays all packages in the [Homebrew/homebrew-core](https://github.com/Homebrew/homebrew-core) and [Homebrew/homebrew-cask](https://github.com/Homebrew/homebrew-cask). A [GitHub Action](https://github.com/Homebrew/formulae.brew.sh/blob/master/.github/workflows/scheduled.yml) is run periodically which pulls changes from each tap and deploys the site to GitHub Pages.
 
 ## JSON API
 It also provides a JSON API for all packages (or individual packages) in each tap and their related analytics. This JSON data is used for the creation of the HTML resources on this site.

Rakefile

@@ -19,8 +19,7 @@ task :formulae, [:os, :tap] do |task, args|
   ENV["HOMEBREW_NO_COLOR"] = "1"
   sh "brew", "ruby", "script/generate.rb", args[:os], args[:tap]
 end
-CLOBBER.include FileList[%w[_data/formula _data/*_canonical.json api/formula formula
-                         _data/formula-linux api/formula-linux formula-linux]]
+CLOBBER.include FileList[%w[_data/formula _data/formula_canonical.json api/formula formula]]
 
 desc "Dump cask data"
 task :cask, [:tap] do |task, args|
@@ -74,7 +73,6 @@ def generate_analytics_files(os)
 
   if os == "linux"
     analytics_data_path = "_data/analytics-linux"
-    core_tap_name = "linuxbrew-core"
     formula_analytics_os_arg = "--linux"
   end
 
@@ -147,11 +145,6 @@ task :linux_analytics do
   Rake::Task["analytics"].tap(&:reenable).invoke("linux")
 end
 
-desc "Dump all formulae (macOS and Linux)"
-task all_formulae: :formulae do
-  Rake::Task["formulae"].tap(&:reenable).invoke("linux")
-end
-
 desc "Dump all analytics (macOS and Linux)"
 task all_analytics: :analytics do
   Rake::Task["analytics"].tap(&:reenable).invoke("linux")

_config.yml

@@ -41,11 +41,6 @@ taps:
     name: Homebrew/cask
     fullname: Homebrew/homebrew-cask
     remote: https://github.com/Homebrew/homebrew-cask
-  linux:
-    repo: core
-    name: Homebrew/core
-    fullname: Homebrew/linuxbrew-core
-    remote: https://github.com/Homebrew/linuxbrew-core
 
 logo: https://brew.sh/assets/img/homebrew-256x256.png