From 883120c5da7d4e59c8fd03237eeff8badc26a435 Mon Sep 17 00:00:00 2001 From: Joe Corcoran Date: Tue, 29 Jan 2019 18:01:33 +0100 Subject: [PATCH] Add service hooks column and update docker image --- Dockerfile | 8 +++++--- .../migrate/20190129000000_add_legacy_service_hook.rb | 9 +++++++++ db/main/structure.sql | 9 ++++++--- script/dump-schema-docker.sh | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 db/main/migrate/20190129000000_add_legacy_service_hook.rb diff --git a/Dockerfile b/Dockerfile index 51b0bdba..626ab7c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,9 @@ RUN mkdir /travis-migrations WORKDIR /travis-migrations # ruby deps -RUN apt-get update -RUN apt-get install -y wget build-essential bison zlib1g-dev libyaml-dev libssl1.0-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev openssl +RUN apt-get update -y +RUN apt-get upgrade -y +RUN apt-get install -y --fix-missing wget build-essential bison zlib1g-dev libyaml-dev libssl1.0-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev openssl # ruby-install RUN wget -O ruby-install-0.6.1.tar.gz https://github.com/postmodern/ruby-install/archive/v0.6.1.tar.gz @@ -19,5 +20,6 @@ RUN ruby-install --system --no-install-deps ruby `cat .ruby-version` RUN which ruby # gem setup -RUN apt-get install libpq-dev +RUN apt-get install --fix-missing libpq-dev RUN gem install bundler +RUN gem update --system diff --git a/db/main/migrate/20190129000000_add_legacy_service_hook.rb b/db/main/migrate/20190129000000_add_legacy_service_hook.rb new file mode 100644 index 00000000..96228361 --- /dev/null +++ b/db/main/migrate/20190129000000_add_legacy_service_hook.rb @@ -0,0 +1,9 @@ +class AddLegacyServiceHook < ActiveRecord::Migration[5.2] + include Travis::PostgresVersion + + def change + change_table :repositories do |t| + t.column :legacy_service_hook, :boolean + end + end +end diff --git a/db/main/structure.sql b/db/main/structure.sql index b6f68827..508495af 100644 --- a/db/main/structure.sql +++ b/db/main/structure.sql @@ -1715,7 +1715,8 @@ CREATE TABLE public.repositories ( migrated_at timestamp without time zone, active_on_org boolean, managed_by_installation_at timestamp without time zone, - migration_status character varying + migration_status character varying, + legacy_service_hook boolean ); @@ -3266,7 +3267,7 @@ CREATE INDEX index_commits_on_tag_id ON public.commits USING btree (tag_id); -- Name: index_crons_on_branch_id; Type: INDEX; Schema: public; Owner: - -- -CREATE INDEX index_crons_on_branch_id ON public.crons USING btree (branch_id); +CREATE UNIQUE INDEX index_crons_on_branch_id ON public.crons USING btree (branch_id); -- @@ -4743,7 +4744,9 @@ INSERT INTO "schema_migrations" (version) VALUES ('20181203075818'), ('20181203075819'), ('20181203080356'), +('20181205152712'), ('20190102000000'), -('20190102000001'); +('20190102000001'), +('20190129000000'); diff --git a/script/dump-schema-docker.sh b/script/dump-schema-docker.sh index 038e8724..ba99ff4b 100755 --- a/script/dump-schema-docker.sh +++ b/script/dump-schema-docker.sh @@ -4,7 +4,7 @@ set -e docker kill travis-migrations || true docker rm travis-migrations || true -docker run --name travis-migrations -v `pwd`:/travis-migrations -d travisci/travis-migrations:0.1 +docker run --name travis-migrations -v `pwd`:/travis-migrations -d travisci/travis-migrations:0.3 sleep 5