From c9372830e5a3f1bd679781f79760149ada847140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20A=2E=20Bellone?= Date: Sat, 28 Dec 2024 15:36:56 -0300 Subject: [PATCH 1/4] Update base image in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9c18830..7cc170b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.6 +FROM ruby:3.4.1 ENV RACK_ENV=production From 619fdbfbe5f7456d3f9cf5c180f7d00ab56c4b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20A=2E=20Bellone?= Date: Sat, 28 Dec 2024 15:38:10 -0300 Subject: [PATCH 2/4] Updated image in pipeline --- .buildkite/pipeline.deploy.yml | 4 ++-- .buildkite/pipeline.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildkite/pipeline.deploy.yml b/.buildkite/pipeline.deploy.yml index a0b460e..0c7260b 100644 --- a/.buildkite/pipeline.deploy.yml +++ b/.buildkite/pipeline.deploy.yml @@ -6,7 +6,7 @@ steps: - rubocop plugins: - docker#v5.11.0: - image: ruby:3.3.4 + image: ruby:3.4.1 - label: ":rspec: Snapshot Testing" command: @@ -14,7 +14,7 @@ steps: - rspec spec plugins: - docker#v5.11.0: - image: ruby:3.3.4 + image: ruby:3.4.1 workdir: /app - wait: ~ diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 406ebca..6d9d08d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -5,7 +5,7 @@ steps: - rubocop plugins: - docker#v5.11.0: - image: ruby:3.3.4 + image: ruby:3.4.1 - label: ":rspec: Snapshot Testing" command: @@ -13,5 +13,5 @@ steps: - rspec spec plugins: - docker#v5.11.0: - image: ruby:3.3.4 + image: ruby:3.4.1 workdir: /app From e0a3b02f77768e01007a2ffe8c5dafd52d4c5c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20A=2E=20Bellone?= Date: Sat, 28 Dec 2024 15:40:56 -0300 Subject: [PATCH 3/4] Update bundle to use default bundle version --- app/Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Gemfile.lock b/app/Gemfile.lock index b828d85..3ace23d 100644 --- a/app/Gemfile.lock +++ b/app/Gemfile.lock @@ -4,7 +4,7 @@ GEM ast (2.4.2) awesome_print (1.9.2) diff-lcs (1.5.1) - json (2.9.0) + json (2.9.1) language_server-protocol (3.17.0.3) nio4r (2.7.4) parallel (1.26.3) @@ -17,7 +17,7 @@ GEM racc (1.8.1) rack (3.1.8) rainbow (3.1.1) - regexp_parser (2.9.3) + regexp_parser (2.10.0) rouge (4.5.1) rspec (3.13.0) rspec-core (~> 3.13.0) @@ -34,7 +34,7 @@ GEM rspec-snapshot (2.0.3) awesome_print (> 1.0.0) rspec (> 3.0.0) - rspec-support (3.13.1) + rspec-support (3.13.2) rubocop (1.69.2) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -45,10 +45,10 @@ GEM rubocop-ast (>= 1.36.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.36.2) + rubocop-ast (1.37.0) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) - unicode-display_width (3.1.2) + unicode-display_width (3.1.3) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) @@ -66,4 +66,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 2.5.22 + 2.6.2 From 1b913cdc609c76c26611eafaab253b20446c6310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20A=2E=20Bellone?= Date: Sat, 28 Dec 2024 15:44:56 -0300 Subject: [PATCH 4/4] Update snapshots due to hash space changes --- .../snapshots/examples/bitbucket/custom.yml.snap | 6 +++--- .../snapshots/examples/bitbucket/manual.yml.snap | 8 ++++---- .../snapshots/examples/bitbucket/parallel.yml.snap | 4 ++-- .../snapshots/examples/bitbucket/stages.yaml.snap | 10 +++++----- .../snapshots/examples/bitbucket/variables.yml.snap | 8 ++++---- .../snapshots/examples/circleci/executors.yml.snap | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/custom.yml.snap b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/custom.yml.snap index 5dc2b36..a882863 100644 --- a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/custom.yml.snap +++ b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/custom.yml.snap @@ -1,8 +1,8 @@ --- steps: -- key: execute-3c6693d9c5739b3f1e3ce7a4a8e495f68f0428a9 - prompt: Execute step 3c6693d9c5739b3f1e3ce7a4a8e495f68f0428a9? - input: execute-3c6693d9c5739b3f1e3ce7a4a8e495f68f0428a9 +- key: execute-5af567048c196d644962c4772d3aafb6029184c3 + prompt: Execute step 5af567048c196d644962c4772d3aafb6029184c3? + input: execute-5af567048c196d644962c4772d3aafb6029184c3 - commands: - echo "Manual triggers for Sonar are awesome!" label: sonar Script step diff --git a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/manual.yml.snap b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/manual.yml.snap index aa49700..46ab171 100644 --- a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/manual.yml.snap +++ b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/manual.yml.snap @@ -4,11 +4,11 @@ steps: - echo 'running' label: simple - wait -- key: execute-cad93b8b7bf63eb33ffe9002d9b6932eb155ec3c - prompt: Execute step cad93b8b7bf63eb33ffe9002d9b6932eb155ec3c? - input: execute-cad93b8b7bf63eb33ffe9002d9b6932eb155ec3c +- key: execute-bdbce8d743ed804e10bcfb5ecb85ac5bafcb219d + prompt: Execute step bdbce8d743ed804e10bcfb5ecb85ac5bafcb219d? + input: execute-bdbce8d743ed804e10bcfb5ecb85ac5bafcb219d - commands: - echo 'running' depends_on: - - execute-cad93b8b7bf63eb33ffe9002d9b6932eb155ec3c + - execute-bdbce8d743ed804e10bcfb5ecb85ac5bafcb219d label: complex diff --git a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/parallel.yml.snap b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/parallel.yml.snap index 9ad1f02..8cf4ccd 100644 --- a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/parallel.yml.snap +++ b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/parallel.yml.snap @@ -2,8 +2,8 @@ steps: - commands: - "./build.sh" - label: parallel-7745d6f42f7f67b5b911003efa6bdd7a809f392c Build -- group: parallel-d0d6955d5365cdcbbd5215f583dbea2be5cbff7e + label: parallel-dc4a1a175ef1caae3f6e0ac055381fb44d1f187e Build +- group: parallel-7f796b98b1a2e1e54e2e452dd31ed13835e384dc steps: - commands: - "./integration-tests.sh --batch 1" diff --git a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/stages.yaml.snap b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/stages.yaml.snap index 06ace46..a1dfe32 100644 --- a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/stages.yaml.snap +++ b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/stages.yaml.snap @@ -27,17 +27,17 @@ steps: label: Run unit tests - group: manual stage steps: - - key: execute-5f4b7c80dda894d4254d2c5547b1c7dc5dc16891 - prompt: Execute step 5f4b7c80dda894d4254d2c5547b1c7dc5dc16891? - input: execute-5f4b7c80dda894d4254d2c5547b1c7dc5dc16891 + - key: execute-27f5be813d45b642f493c4b7e2239da2924175fe + prompt: Execute step 27f5be813d45b642f493c4b7e2239da2924175fe? + input: execute-27f5be813d45b642f493c4b7e2239da2924175fe - commands: - sh ./build-app.sh depends_on: - - execute-5f4b7c80dda894d4254d2c5547b1c7dc5dc16891 + - execute-27f5be813d45b642f493c4b7e2239da2924175fe label: Build app - wait - commands: - sh ./run-tests.sh depends_on: - - execute-5f4b7c80dda894d4254d2c5547b1c7dc5dc16891 + - execute-27f5be813d45b642f493c4b7e2239da2924175fe label: Run unit tests diff --git a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/variables.yml.snap b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/variables.yml.snap index 9d909a3..caeaf63 100644 --- a/app/spec/lib/bk/compat/snapshots/examples/bitbucket/variables.yml.snap +++ b/app/spec/lib/bk/compat/snapshots/examples/bitbucket/variables.yml.snap @@ -1,11 +1,11 @@ --- steps: -- key: execute-34fda39a698739f93a76af1583cf0b9e937f3561 - prompt: Execute step 34fda39a698739f93a76af1583cf0b9e937f3561? - input: execute-34fda39a698739f93a76af1583cf0b9e937f3561 +- key: execute-1de51055e91f39665c01117ad6a5210700263f13 + prompt: Execute step 1de51055e91f39665c01117ad6a5210700263f13? + input: execute-1de51055e91f39665c01117ad6a5210700263f13 - group: deployer depends_on: - - execute-34fda39a698739f93a76af1583cf0b9e937f3561 + - execute-1de51055e91f39665c01117ad6a5210700263f13 steps: - key: custom-vars fields: diff --git a/app/spec/lib/bk/compat/snapshots/examples/circleci/executors.yml.snap b/app/spec/lib/bk/compat/snapshots/examples/circleci/executors.yml.snap index b8ad878..d6786a0 100644 --- a/app/spec/lib/bk/compat/snapshots/examples/circleci/executors.yml.snap +++ b/app/spec/lib/bk/compat/snapshots/examples/circleci/executors.yml.snap @@ -1,7 +1,7 @@ --- steps: - commands: - - '# executor {"name"=>"win/default", "size"=>"medium"} not supported yet' + - '# executor {"name" => "win/default", "size" => "medium"} not supported yet' - Hello, Orb Executor key: orb-executor - commands: