From b892f566e5daf19561c0aac84e48e0ce409c71a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=90=D0=BD=D0=B3=D0=B8=D0=BD?= Date: Mon, 22 Jan 2018 10:40:11 +0300 Subject: [PATCH 1/4] fix missing semicolon in Postgres script's files --- .../postgres/files/013_add_column_repo_visibility.sql | 4 ++-- .../ddl/postgres/files/014_add_column_repo_seq.sql | 3 ++- .../ddl/postgres/files/015_add_column_repo_active.sql | 4 ++-- .../ddl/postgres/files/016_add_column_user_synced.sql | 2 +- .../ddl/postgres/files/018_add_column_file_pid.sql | 9 +++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/store/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql b/store/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql index ed795dfc2..03b73f888 100644 --- a/store/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql +++ b/store/datastore/ddl/postgres/files/013_add_column_repo_visibility.sql @@ -1,6 +1,6 @@ -- name: alter-table-add-repo-visibility -ALTER TABLE repos ADD COLUMN repo_visibility VARCHAR(50) +ALTER TABLE repos ADD COLUMN repo_visibility VARCHAR(50); -- name: update-table-set-repo-visibility @@ -8,4 +8,4 @@ UPDATE repos SET repo_visibility = (CASE WHEN repo_private = false THEN 'public' ELSE 'private' - END) + END); diff --git a/store/datastore/ddl/postgres/files/014_add_column_repo_seq.sql b/store/datastore/ddl/postgres/files/014_add_column_repo_seq.sql index a0be87dda..2c45f95b6 100644 --- a/store/datastore/ddl/postgres/files/014_add_column_repo_seq.sql +++ b/store/datastore/ddl/postgres/files/014_add_column_repo_seq.sql @@ -8,9 +8,10 @@ UPDATE repos SET repo_counter = ( SELECT max(build_number) FROM builds WHERE builds.build_repo_id = repos.repo_id -) +); -- name: update-table-set-repo-seq-default UPDATE repos SET repo_counter = 0 WHERE repo_counter IS NULL +; \ No newline at end of file diff --git a/store/datastore/ddl/postgres/files/015_add_column_repo_active.sql b/store/datastore/ddl/postgres/files/015_add_column_repo_active.sql index 4dca2dd1e..627ffda0c 100644 --- a/store/datastore/ddl/postgres/files/015_add_column_repo_active.sql +++ b/store/datastore/ddl/postgres/files/015_add_column_repo_active.sql @@ -1,7 +1,7 @@ -- name: alter-table-add-repo-active -ALTER TABLE repos ADD COLUMN repo_active BOOLEAN +ALTER TABLE repos ADD COLUMN repo_active BOOLEAN; -- name: update-table-set-repo-active -UPDATE repos SET repo_active = true +UPDATE repos SET repo_active = true; diff --git a/store/datastore/ddl/postgres/files/016_add_column_user_synced.sql b/store/datastore/ddl/postgres/files/016_add_column_user_synced.sql index 43db914e7..efe2d9bed 100644 --- a/store/datastore/ddl/postgres/files/016_add_column_user_synced.sql +++ b/store/datastore/ddl/postgres/files/016_add_column_user_synced.sql @@ -4,4 +4,4 @@ ALTER TABLE users ADD COLUMN user_synced INTEGER; -- name: update-table-set-user-synced -UPDATE users SET user_synced = 0 +UPDATE users SET user_synced = 0; diff --git a/store/datastore/ddl/postgres/files/018_add_column_file_pid.sql b/store/datastore/ddl/postgres/files/018_add_column_file_pid.sql index 0ad11ac78..a8ee163c1 100644 --- a/store/datastore/ddl/postgres/files/018_add_column_file_pid.sql +++ b/store/datastore/ddl/postgres/files/018_add_column_file_pid.sql @@ -1,18 +1,18 @@ -- name: alter-table-add-file-pid -ALTER TABLE files ADD COLUMN file_pid INTEGER +ALTER TABLE files ADD COLUMN file_pid INTEGER; -- name: alter-table-add-file-meta-passed -ALTER TABLE files ADD COLUMN file_meta_passed INTEGER +ALTER TABLE files ADD COLUMN file_meta_passed INTEGER; -- name: alter-table-add-file-meta-failed -ALTER TABLE files ADD COLUMN file_meta_failed INTEGER +ALTER TABLE files ADD COLUMN file_meta_failed INTEGER; -- name: alter-table-add-file-meta-skipped -ALTER TABLE files ADD COLUMN file_meta_skipped INTEGER +ALTER TABLE files ADD COLUMN file_meta_skipped INTEGER; -- name: alter-table-update-file-meta @@ -20,3 +20,4 @@ UPDATE files SET file_meta_passed=0 ,file_meta_failed=0 ,file_meta_skipped=0 +; \ No newline at end of file From fe593eedd123c709e58ac4f8e7a0a1603f8bd6a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Sch=C3=B6lzel?= Date: Thu, 1 Feb 2018 22:06:39 +0100 Subject: [PATCH 2/4] upgrade alpine base images to latest version --- Dockerfile.agent.alpine | 2 +- Dockerfile.alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.agent.alpine b/Dockerfile.agent.alpine index a2bb3ce29..eac573ebd 100644 --- a/Dockerfile.agent.alpine +++ b/Dockerfile.agent.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 RUN apk add -U --no-cache ca-certificates diff --git a/Dockerfile.alpine b/Dockerfile.alpine index a22797c86..2d7047220 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.6 +FROM alpine:3.7 EXPOSE 8000 9000 80 443 RUN apk add -U --no-cache ca-certificates From 487f6c9501df309000a1f9df89dbc7780a2b27fb Mon Sep 17 00:00:00 2001 From: Philippe Schommers Date: Tue, 20 Feb 2018 18:53:03 +0100 Subject: [PATCH 3/4] Fix gitea `actionSync` --- remote/gitea/parse.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remote/gitea/parse.go b/remote/gitea/parse.go index d398447c9..731926f9f 100644 --- a/remote/gitea/parse.go +++ b/remote/gitea/parse.go @@ -28,7 +28,7 @@ const ( hookPullRequest = "pull_request" actionOpen = "opened" - actionSync = "synchronize" + actionSync = "synchronized" stateOpen = "open" From 97da9394755b2967649a4958f0abab359becb644 Mon Sep 17 00:00:00 2001 From: Rodolfo Rodriguez Date: Thu, 1 Mar 2018 17:09:33 -0600 Subject: [PATCH 4/4] Update router.go Removes unused code --- router/router.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/router/router.go b/router/router.go index c86dc13ba..efbb5364b 100644 --- a/router/router.go +++ b/router/router.go @@ -189,10 +189,3 @@ func Load(mux *httptreemux.ContextMux, middleware ...gin.HandlerFunc) http.Handl return e } - -// type FileHandler interface { -// Index(res http.ResponseWriter, data interface{}) error -// Login(res http.ResponseWriter, data interface{}) error -// Error(res http.ResponseWriter, data interface{}) error -// Asset(res http.ResponseWriter, req *http.Request) -// }