[neon/infrastructure/pangea-gemstash] /: improve the defaults and drop the kruft
Carlos De Maine
null at kde.org
Fri May 26 03:20:37 BST 2023
Git commit 8b6153f7b40b894c1ef56a0f50736e0e08753d32 by Carlos De Maine.
Committed on 26/05/2023 at 02:20.
Pushed by carlosdem into branch 'master'.
improve the defaults and drop the kruft
M +6 -7 Gemfile
D +0 -66 Gemfile.backup
D +0 -17 Gemfile.lock
D +0 -69 Gemfile.lock.old
M +1 -0 config.yaml
https://invent.kde.org/neon/infrastructure/pangea-gemstash/-/commit/8b6153f7b40b894c1ef56a0f50736e0e08753d32
diff --git a/Gemfile b/Gemfile
index bb1eb65..b4f2b57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,13 @@
# ./Gemfile
require "cgi"
-#source "https://gem.cache.pangea.pub"
-# uncomment for local testing
-source "http://localhost:9292"
+source "https://gem.cache.pangea.pub"
+# private tooling built gems.
gem "releaseme"
gem "jenkins_junit_builder"
-#source "https://gem.cache.pangea.pub/upstream/#{CGI.escape("https://rubygems.org")}" do
-# uncomment for local testing
+# upstream gems we want pinned and therefore cached, would normally be listed but
+# instead tooling sources that list from the pangea-tooling Gemfile
+
+# use rubygems for anything else not specified
source "http://localhost:9292/upstream/#{CGI.escape("https://rubygems.org")}" do
-#gem "farraday"
-#gem "gemstash"
end
diff --git a/Gemfile.backup b/Gemfile.backup
deleted file mode 100644
index 9b990d7..0000000
--- a/Gemfile.backup
+++ /dev/null
@@ -1,66 +0,0 @@
-# this is the old geminabox Gemfile.lock(.old) ported to gemstash. something is still not
-# right it errors out when there are multiple conditions. formatting....?...
-
-# ./Gemfile
-require "cgi"
-source "https://gem.cache.pangea.pub"
-gem "geminabox"
-gem "jenkins_junit_builder"
-
-source "https://gem.cache.pangea.pub/upstream/#{CGI.escape("https://my.gem-source.local")}" do
-gem "activesupport", "6.1.4.4"
-gem "concurrent-ruby", "~> 1.0" ">= 1.0.2"
-gem "i18n", ">= 1.6", "< 2"
-gem "minitest", ">= 5.1"
-gem "tzinfo", "~> 2.0"
-gem "zeitwerk", "~> 2.3"
-gem "concurrent-ruby", "1.2.2"
-gem "dalli", "3.2.4"
-gem "faraday", "0.17.6"
-gem "multipart-post", ">= 1.2", "< 3"
-gem "faraday_middleware", "0.14.0"
-gem "faraday", ">= 0.7.4", "< 1.0"
-gem "gemstash", "2.2.2"
-gem "activesupport", ">= 4.2", "< 8"
-gem "dalli", ">= 3.2.3, < 4"
-gem "faraday", "~> 0.9"
-gem "faraday_middleware", "~> 0.10"
-gem "lru_redux", "~> 1.1"
-gem "psych", ">= 3.2.1"
-gem "puma", "~> 4.0"
-gem "sequel", "~> 5.0"
-gem "server_health_check-rack", "~> 0.1"
-gem "sinatra", ">= 1.4, < 3.0"
-gem "sqlite3", "~> 1.3"
-gem "thor", "~> 0.20"
-gem "i18n", "1.10.0"
-gem "concurrent-ruby", "~> 1.0"
-gem "lru_redux", "1.1.0"
-gem "minitest", "5.18.0"
-gem "multipart-post", "2.1.1"
-gem "mustermann", "2.0.2"
-gem "ruby2_keywords", "~> 0.0.1"
-gem "nio4r", "2.5.9"
-gem "psych", "3.3.0"
-gem "puma", "4.3.12"
-gem "nio4r", "~> 2.0"
-gem "rack", "2.2.7"
-gem "rack-protection", "2.2.4"
-gem "rack"
-gem "ruby2_keywords", "0.0.5"
-gem "sequel", "5.68.0"
-gem "server_health_check", "1.0.2"
-gem "server_health_check-rack", "0.1.0"
-gem "server_health_check", "~> 1.0", ">= 1.0.1"
-gem "sinatra", "2.2.4"
-gem "mustermann", "~> 2.0"
-gem "rack", "~> 2.2"
-gem "rack-protection", "= 2.2.4"
-gem "tilt", "~> 2.0"
-gem "sqlite3", "1.6.3-x86_64-linux"
-gem "thor", "0.20.3"
-gem "tilt", "2.0.11"
-gem "tzinfo", "2.0.4"
-gem "concurrent-ruby", "~> 1.0"
-gem "zeitwerk", "2.5.4"
-end
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index af300fa..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,17 +0,0 @@
-GEM
- remote: http://localhost:9292/
- specs:
- releaseme (0.0.20221129.1049)
-
-GEM
- remote: http://localhost:9292/upstream/https%3A%2F%2Frubygems.org/
- specs:
-
-PLATFORMS
- x86_64-linux
-
-DEPENDENCIES
- releaseme
-
-BUNDLED WITH
- 2.4.13
diff --git a/Gemfile.lock.old b/Gemfile.lock.old
deleted file mode 100644
index c7efbb4..0000000
--- a/Gemfile.lock.old
+++ /dev/null
@@ -1,69 +0,0 @@
-# original lockfile from geminabox
-
-GEM
- remote: https://rubygems.org/
- specs:
- activesupport (6.1.4.4)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 1.6, < 2)
- minitest (>= 5.1)
- tzinfo (~> 2.0)
- zeitwerk (~> 2.3)
- concurrent-ruby (1.2.2)
- dalli (3.2.4)
- faraday (0.17.6)
- multipart-post (>= 1.2, < 3)
- faraday_middleware (0.14.0)
- faraday (>= 0.7.4, < 1.0)
- gemstash (2.2.2)
- activesupport (>= 4.2, < 8)
- dalli (>= 3.2.3, < 4)
- faraday (~> 0.9)
- faraday_middleware (~> 0.10)
- lru_redux (~> 1.1)
- psych (>= 3.2.1)
- puma (~> 4.0)
- sequel (~> 5.0)
- server_health_check-rack (~> 0.1)
- sinatra (>= 1.4, < 3.0)
- sqlite3 (~> 1.3)
- thor (~> 0.20)
- i18n (1.10.0)
- concurrent-ruby (~> 1.0)
- lru_redux (1.1.0)
- minitest (5.18.0)
- multipart-post (2.1.1)
- mustermann (2.0.2)
- ruby2_keywords (~> 0.0.1)
- nio4r (2.5.9)
- psych (3.3.0)
- puma (4.3.12)
- nio4r (~> 2.0)
- rack (2.2.7)
- rack-protection (2.2.4)
- rack
- ruby2_keywords (0.0.5)
- sequel (5.68.0)
- server_health_check (1.0.2)
- server_health_check-rack (0.1.0)
- server_health_check (~> 1.0, >= 1.0.1)
- sinatra (2.2.4)
- mustermann (~> 2.0)
- rack (~> 2.2)
- rack-protection (= 2.2.4)
- tilt (~> 2.0)
- sqlite3 (1.6.3-x86_64-linux)
- thor (0.20.3)
- tilt (2.0.11)
- tzinfo (2.0.4)
- concurrent-ruby (~> 1.0)
- zeitwerk (2.5.4)
-
-PLATFORMS
- x86_64-linux
-
-DEPENDENCIES
- gemstash
-
-BUNDLED WITH
- 2.4.13
diff --git a/config.yaml b/config.yaml
index fa65572..005f43f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -11,6 +11,7 @@
:db_options:
:max_connections: 1
#:rubygems_url: https://gem.cache.pangea.pub
+:rubygems_url: http://localhost:9292
:ignore_gemfile_source: false
:puma_threads: 32
:bind: tcp://0.0.0.0:9292
More information about the Neon-commits
mailing list