From cdb729b03612e2b35c069503674ea12e15cf0a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Fri, 9 Sep 2022 15:14:14 +0200 Subject: [PATCH 1/7] increase cloud build timeout --- script/ci/cloudbuild-build-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/ci/cloudbuild-build-master.yaml b/script/ci/cloudbuild-build-master.yaml index 31522031be78..6cc859327e82 100644 --- a/script/ci/cloudbuild-build-master.yaml +++ b/script/ci/cloudbuild-build-master.yaml @@ -208,7 +208,7 @@ steps: fi waitFor: ['build-cartodb-onprem', 'build-cartodb', 'build-cartodb-onprem-cron'] -timeout: 1800s +timeout: 3600s substitutions: _BRANCH_TAG: ${BRANCH_NAME//\//-} _DOCKER_IMAGE_NAME: gcr.io/cartodb-on-gcp-main-artifacts/builder From 87de1af802969e5996d90d3ac061d47af69a2eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Fri, 9 Sep 2022 15:15:23 +0200 Subject: [PATCH 2/7] increase timeout --- script/ci/cloudbuild-build-pr-branch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/ci/cloudbuild-build-pr-branch.yaml b/script/ci/cloudbuild-build-pr-branch.yaml index 4bc4e29e265d..8f012d88e8f1 100644 --- a/script/ci/cloudbuild-build-pr-branch.yaml +++ b/script/ci/cloudbuild-build-pr-branch.yaml @@ -155,7 +155,7 @@ steps: docker build --label="org.opencontainers.image.created=$$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${COMMIT_SHA} -t ${_DOCKER_IMAGE_NAME}-onprem-cron:latest -t ${_DOCKER_IMAGE_NAME}-onprem-cron:${_BRANCH_TAG} -t ${_DOCKER_IMAGE_NAME}-onprem-cron:${SHORT_SHA} -t ${_DOCKER_IMAGE_NAME}-onprem-cron:${_BRANCH_TAG}--${SHORT_SHA} -f Dockerfile.cron . waitFor: ['build-cartodb-onprem'] -timeout: 2700s +timeout: 3600s images: - ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG}--${SHORT_SHA} - ${_DOCKER_IMAGE_NAME}:${_BRANCH_TAG} From 02c4a46044952d48aedebf6526e2c4820d9c8742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Fri, 9 Sep 2022 15:17:26 +0200 Subject: [PATCH 3/7] downgrade rubocop version --- .github/workflows/rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 88bf2116fed1..52fbc5d4c72c 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -15,7 +15,7 @@ jobs: - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: - rubocop_version: 1.23.0 + rubocop_version: 1.17.0 github_token: ${{ secrets.github_token }} reporter: github-pr-check level: error From d9191c6cd3e4af410f9e6d2429cf883c1b82b87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Fri, 9 Sep 2022 16:03:45 +0200 Subject: [PATCH 4/7] Update rubocop.yml --- .github/workflows/rubocop.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 52fbc5d4c72c..a1a417a5c73b 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -12,10 +12,11 @@ jobs: with: ruby-version: 2.5.8 - run: 'gem install activesupport -v 6.1.4.4' + - run: 'gem install rubocop-ast -v 1.17.0' - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: - rubocop_version: 1.17.0 + rubocop_version: 1.23.0 github_token: ${{ secrets.github_token }} reporter: github-pr-check level: error From a27d5031a8d4ccd300a5c06d09af5af4f5607e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Mon, 12 Sep 2022 08:27:11 +0200 Subject: [PATCH 5/7] rubocop 1.17.0 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d47620a28863..089942772078 100644 --- a/Gemfile +++ b/Gemfile @@ -121,7 +121,7 @@ group :development, :test do gem 'pry-byebug', '3.9.0' gem 'rack' gem 'rb-readline' - gem 'rubocop', '~> 1.12.0', require: false + gem 'rubocop', '~> 1.17.0', require: false gem 'rubocop-performance', require: false gem 'rubocop-rails', require: false gem 'rubocop-rspec', require: false From a8d7e2d9cfc619e208874f2b257dece26cf1d701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Mon, 12 Sep 2022 08:30:04 +0200 Subject: [PATCH 6/7] Update rubocop.yml --- .github/workflows/rubocop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index a1a417a5c73b..88bf2116fed1 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -12,7 +12,6 @@ jobs: with: ruby-version: 2.5.8 - run: 'gem install activesupport -v 6.1.4.4' - - run: 'gem install rubocop-ast -v 1.17.0' - name: Rubocop linter uses: reviewdog/action-rubocop@v1 with: From a4d7d1f31bb8639bc3f91a152e87b05e82e849ac Mon Sep 17 00:00:00 2001 From: alberhander Date: Mon, 12 Sep 2022 08:42:01 +0200 Subject: [PATCH 7/7] revert version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 089942772078..d47620a28863 100644 --- a/Gemfile +++ b/Gemfile @@ -121,7 +121,7 @@ group :development, :test do gem 'pry-byebug', '3.9.0' gem 'rack' gem 'rb-readline' - gem 'rubocop', '~> 1.17.0', require: false + gem 'rubocop', '~> 1.12.0', require: false gem 'rubocop-performance', require: false gem 'rubocop-rails', require: false gem 'rubocop-rspec', require: false