From ec6d92e792113c183add9e95d1ee1afcd23486c6 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 7 Jan 2022 11:16:33 +0100 Subject: [PATCH] explicitly pin thor to 1.1.0 (cherry picked from commit 62560ba5b2afcf4ba553aa06476ea319cc02afe7) --- debian/bionic/foreman/changelog | 6 ++++++ debian/bionic/foreman/rules | 3 ++- debian/buster/foreman/changelog | 6 ++++++ debian/buster/foreman/rules | 3 ++- debian/focal/foreman/changelog | 6 ++++++ debian/focal/foreman/rules | 3 ++- 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/debian/bionic/foreman/changelog b/debian/bionic/foreman/changelog index 18ab1b17ef..c92a299e23 100644 --- a/debian/bionic/foreman/changelog +++ b/debian/bionic/foreman/changelog @@ -1,3 +1,9 @@ +foreman (3.0.2-2) stable; urgency=low + + * explicitly pin thor to 1.1.0 + + -- Evgeni Golov Tue, 08 Mar 2022 11:16:15 +0100 + foreman (3.0.2-1) stable; urgency=low * 3.0.2 released diff --git a/debian/bionic/foreman/rules b/debian/bionic/foreman/rules index 5d7cd8e214..65278dd00c 100755 --- a/debian/bionic/foreman/rules +++ b/debian/bionic/foreman/rules @@ -12,7 +12,8 @@ build: /bin/cp config/dynflow/worker.yml.example config/dynflow/worker.yml /usr/bin/gem install -f rake -v '12.3.1' /usr/bin/gem install -f minitest -v '5.10.3' - /usr/bin/gem install -f thor -v '1.1.0' + /bin/mkdir -p ./vendor/cache + echo 'gem "thor", "1.1.0"' >> Gemfile /bin/rm -f bundler.d/test.rb bundler.d/development.rb /bin/sed -i '2i gem "puma-status"' bundler.d/service.rb /bin/sed -i '/dynflow/ s/2.0.0/1.6.0/' Gemfile diff --git a/debian/buster/foreman/changelog b/debian/buster/foreman/changelog index 18ab1b17ef..c92a299e23 100644 --- a/debian/buster/foreman/changelog +++ b/debian/buster/foreman/changelog @@ -1,3 +1,9 @@ +foreman (3.0.2-2) stable; urgency=low + + * explicitly pin thor to 1.1.0 + + -- Evgeni Golov Tue, 08 Mar 2022 11:16:15 +0100 + foreman (3.0.2-1) stable; urgency=low * 3.0.2 released diff --git a/debian/buster/foreman/rules b/debian/buster/foreman/rules index 76c13f9f3f..97850d7bce 100755 --- a/debian/buster/foreman/rules +++ b/debian/buster/foreman/rules @@ -10,7 +10,8 @@ build: /bin/cp config/database.yml.example config/database.yml /bin/cp config/dynflow/orchestrator.yml.example config/dynflow/orchestrator.yml /bin/cp config/dynflow/worker.yml.example config/dynflow/worker.yml - /usr/bin/gem install -f thor -v '1.1.0' + /bin/mkdir -p ./vendor/cache + echo 'gem "thor", "1.1.0"' >> Gemfile /bin/rm -f bundler.d/test.rb bundler.d/development.rb /bin/sed -i '2i gem "puma-status"' bundler.d/service.rb /bin/sed -i '/dynflow/ s/2.0.0/1.6.0/' Gemfile diff --git a/debian/focal/foreman/changelog b/debian/focal/foreman/changelog index 18ab1b17ef..c92a299e23 100644 --- a/debian/focal/foreman/changelog +++ b/debian/focal/foreman/changelog @@ -1,3 +1,9 @@ +foreman (3.0.2-2) stable; urgency=low + + * explicitly pin thor to 1.1.0 + + -- Evgeni Golov Tue, 08 Mar 2022 11:16:15 +0100 + foreman (3.0.2-1) stable; urgency=low * 3.0.2 released diff --git a/debian/focal/foreman/rules b/debian/focal/foreman/rules index 76c13f9f3f..97850d7bce 100755 --- a/debian/focal/foreman/rules +++ b/debian/focal/foreman/rules @@ -10,7 +10,8 @@ build: /bin/cp config/database.yml.example config/database.yml /bin/cp config/dynflow/orchestrator.yml.example config/dynflow/orchestrator.yml /bin/cp config/dynflow/worker.yml.example config/dynflow/worker.yml - /usr/bin/gem install -f thor -v '1.1.0' + /bin/mkdir -p ./vendor/cache + echo 'gem "thor", "1.1.0"' >> Gemfile /bin/rm -f bundler.d/test.rb bundler.d/development.rb /bin/sed -i '2i gem "puma-status"' bundler.d/service.rb /bin/sed -i '/dynflow/ s/2.0.0/1.6.0/' Gemfile