From efb6bb66518aa32d5333522b62f1c731ffe05cf6 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 13:44:08 -0500 Subject: [PATCH 01/13] try out workflow --- .github/workflows/2024-ruby.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml index e2571b5..64454df 100644 --- a/.github/workflows/2024-ruby.yaml +++ b/.github/workflows/2024-ruby.yaml @@ -3,7 +3,6 @@ name: 2024-ruby on: pull_request: push: - branches: [master] paths: - 2024/ruby/** @@ -21,5 +20,8 @@ jobs: with: bundler-cache: true working-directory: ./2024/ruby + - name: RuboCop Linter Action + uses: andrewmcodes/rubocop-linter-action@v3.3.0 + - name: Run tests run: bundle exec rspec From 849cf707ad5cd481e046f2b12a792967956cd2a8 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 13:45:12 -0500 Subject: [PATCH 02/13] test --- .github/workflows/2024-ruby.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml index 64454df..06c10b2 100644 --- a/.github/workflows/2024-ruby.yaml +++ b/.github/workflows/2024-ruby.yaml @@ -22,6 +22,5 @@ jobs: working-directory: ./2024/ruby - name: RuboCop Linter Action uses: andrewmcodes/rubocop-linter-action@v3.3.0 - - name: Run tests run: bundle exec rspec From 3e767311858271c534f45328e3d736289370f47a Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 13:57:52 -0500 Subject: [PATCH 03/13] try composite action --- .github/workflows/2024-ruby.yaml | 13 ++++++------- .github/workflows/shared/setup/action.yaml | 11 +++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/shared/setup/action.yaml diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml index 06c10b2..e769b15 100644 --- a/.github/workflows/2024-ruby.yaml +++ b/.github/workflows/2024-ruby.yaml @@ -11,16 +11,15 @@ defaults: working-directory: ./2024/ruby jobs: - tests: + lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - bundler-cache: true - working-directory: ./2024/ruby + - uses: "./.github/shared/setup" - name: RuboCop Linter Action uses: andrewmcodes/rubocop-linter-action@v3.3.0 + tests: + runs-on: ubuntu-latest + steps: + - uses: "./.github/shared/setup" - name: Run tests run: bundle exec rspec diff --git a/.github/workflows/shared/setup/action.yaml b/.github/workflows/shared/setup/action.yaml new file mode 100644 index 0000000..71a3085 --- /dev/null +++ b/.github/workflows/shared/setup/action.yaml @@ -0,0 +1,11 @@ +name: "setup ruby" + +runs: + using: "composite" + steps: + - uses: actions/checkout@v3 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + working-directory: ./2024/ruby From 437083b0c1ba50bb6bbe625fe7e51c9e836fe725 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:00:11 -0500 Subject: [PATCH 04/13] rename --- .github/{workflows => }/shared/setup/action.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflows => }/shared/setup/action.yaml (100%) diff --git a/.github/workflows/shared/setup/action.yaml b/.github/shared/setup/action.yaml similarity index 100% rename from .github/workflows/shared/setup/action.yaml rename to .github/shared/setup/action.yaml From eec9e776a02715b88e104ce79937378731454322 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:01:26 -0500 Subject: [PATCH 05/13] wip --- .github/shared/setup/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/shared/setup/action.yaml b/.github/shared/setup/action.yaml index 71a3085..e869b66 100644 --- a/.github/shared/setup/action.yaml +++ b/.github/shared/setup/action.yaml @@ -1,4 +1,5 @@ name: "setup ruby" +description: "checks out code and sets up ruby" runs: using: "composite" From 2608ea4dfaa3287e06454ef2466a6442a18c7eac Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:03:20 -0500 Subject: [PATCH 06/13] wip --- .github/shared/setup/action.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/shared/setup/action.yaml b/.github/shared/setup/action.yaml index e869b66..398db6c 100644 --- a/.github/shared/setup/action.yaml +++ b/.github/shared/setup/action.yaml @@ -4,7 +4,8 @@ description: "checks out code and sets up ruby" runs: using: "composite" steps: - - uses: actions/checkout@v3 + - name: Check out code + uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: From 6fd6b15a1f0041d00247721610871e167e591bb4 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:04:22 -0500 Subject: [PATCH 07/13] wip --- .github/workflows/2024-ruby.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml index e769b15..ab8868e 100644 --- a/.github/workflows/2024-ruby.yaml +++ b/.github/workflows/2024-ruby.yaml @@ -14,12 +14,12 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: "./.github/shared/setup" - - name: RuboCop Linter Action - uses: andrewmcodes/rubocop-linter-action@v3.3.0 + - uses: "./.github/shared/setup" + - name: RuboCop Linter Action + uses: andrewmcodes/rubocop-linter-action@v3.3.0 tests: runs-on: ubuntu-latest steps: - - uses: "./.github/shared/setup" - - name: Run tests - run: bundle exec rspec + - uses: "./.github/shared/setup" + - name: Run tests + run: bundle exec rspec From 9504b22c4f7809aa7c8eae2e055cf2772db15cc1 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:08:42 -0500 Subject: [PATCH 08/13] wip --- .github/shared/setup/action.yaml | 2 +- .github/workflows/2024-ruby.yaml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/shared/setup/action.yaml b/.github/shared/setup/action.yaml index 398db6c..357cc36 100644 --- a/.github/shared/setup/action.yaml +++ b/.github/shared/setup/action.yaml @@ -1,5 +1,5 @@ name: "setup ruby" -description: "checks out code and sets up ruby" +description: "sets up ruby" runs: using: "composite" diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml index ab8868e..c303ad4 100644 --- a/.github/workflows/2024-ruby.yaml +++ b/.github/workflows/2024-ruby.yaml @@ -14,12 +14,14 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: "./.github/shared/setup" + - uses: actions/checkout@v3 + - uses: ./.github/shared/setup - name: RuboCop Linter Action uses: andrewmcodes/rubocop-linter-action@v3.3.0 tests: runs-on: ubuntu-latest steps: - - uses: "./.github/shared/setup" + - uses: actions/checkout@v3 + - uses: ./.github/shared/setup - name: Run tests run: bundle exec rspec From f563a920f798542bdbee23ec2d91ab4e1459fad7 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:11:51 -0500 Subject: [PATCH 09/13] wip --- .github/workflows/2024-ruby.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml index c303ad4..d1350f7 100644 --- a/.github/workflows/2024-ruby.yaml +++ b/.github/workflows/2024-ruby.yaml @@ -16,8 +16,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ./.github/shared/setup - - name: RuboCop Linter Action - uses: andrewmcodes/rubocop-linter-action@v3.3.0 + - uses: andrewmcodes/rubocop-linter-action@v3.3.0 tests: runs-on: ubuntu-latest steps: From 5d970f6de1b8aeaa6e1f23fa1df58b73382bfd93 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:18:23 -0500 Subject: [PATCH 10/13] wip --- .github/workflows/2024-ruby.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml index d1350f7..ce2fe8c 100644 --- a/.github/workflows/2024-ruby.yaml +++ b/.github/workflows/2024-ruby.yaml @@ -16,7 +16,8 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ./.github/shared/setup - - uses: andrewmcodes/rubocop-linter-action@v3.3.0 + - name: Run rubocop + run: bundle exec rubocop tests: runs-on: ubuntu-latest steps: From 3d6709278ecd222b782aa9a14043c50ef3d90230 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:20:30 -0500 Subject: [PATCH 11/13] wip --- .github/shared/setup/action.yaml | 4 +--- .github/workflows/2024-ruby.yaml | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/shared/setup/action.yaml b/.github/shared/setup/action.yaml index 357cc36..bc7ca11 100644 --- a/.github/shared/setup/action.yaml +++ b/.github/shared/setup/action.yaml @@ -1,11 +1,9 @@ name: "setup ruby" -description: "sets up ruby" +description: "setup ruby" runs: using: "composite" steps: - - name: Check out code - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/2024-ruby.yaml b/.github/workflows/2024-ruby.yaml index ce2fe8c..72ae51d 100644 --- a/.github/workflows/2024-ruby.yaml +++ b/.github/workflows/2024-ruby.yaml @@ -15,13 +15,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: ./.github/shared/setup + - name: Setup Ruby + uses: ./.github/shared/setup - name: Run rubocop run: bundle exec rubocop tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: ./.github/shared/setup + - name: Setup Ruby + uses: ./.github/shared/setup - name: Run tests run: bundle exec rspec From 54d45d3148fa2619102b29051ddb88911e32fa19 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 14:29:13 -0500 Subject: [PATCH 12/13] wip --- .github/workflows/2018-ruby.yaml | 1 + .github/workflows/2021-ruby.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/2018-ruby.yaml b/.github/workflows/2018-ruby.yaml index f3ab9e0..f2a78b0 100644 --- a/.github/workflows/2018-ruby.yaml +++ b/.github/workflows/2018-ruby.yaml @@ -26,5 +26,6 @@ jobs: with: ruby-version: ${{ steps.determine-ruby-version.outputs.VERSION }} bundler-cache: true + working-directory: ./2018/ruby - name: Run tests run: bundle exec rspec diff --git a/.github/workflows/2021-ruby.yaml b/.github/workflows/2021-ruby.yaml index e3ad965..9231707 100644 --- a/.github/workflows/2021-ruby.yaml +++ b/.github/workflows/2021-ruby.yaml @@ -26,5 +26,6 @@ jobs: with: ruby-version: ${{ steps.determine-ruby-version.outputs.VERSION }} bundler-cache: true + working-directory: ./2021/ruby - name: Run tests run: bundle exec rspec From c354e30279604eda545cb98e28cbd20730c10cc0 Mon Sep 17 00:00:00 2001 From: Matt McMahand Date: Thu, 5 Dec 2024 15:04:14 -0500 Subject: [PATCH 13/13] old tests cleaup --- 2018/ruby/spec/advent_03_spec.rb | 2 +- 2018/ruby/spec/advent_05_spec.rb | 4 ++-- 2018/ruby/spec/advent_06_spec.rb | 5 ++--- 2018/ruby/spec/advent_07_spec.rb | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/2018/ruby/spec/advent_03_spec.rb b/2018/ruby/spec/advent_03_spec.rb index 073cebe..796e22b 100644 --- a/2018/ruby/spec/advent_03_spec.rb +++ b/2018/ruby/spec/advent_03_spec.rb @@ -29,7 +29,7 @@ expect(rectangle.width).to eq(4) end - it "solves the puzzle", solution: true do + it "solves the puzzle", solution: true, slow: true do reader = ClaimReader.new(puzzle_input) claims = reader.process diff --git a/2018/ruby/spec/advent_05_spec.rb b/2018/ruby/spec/advent_05_spec.rb index 7a3c45c..caac678 100644 --- a/2018/ruby/spec/advent_05_spec.rb +++ b/2018/ruby/spec/advent_05_spec.rb @@ -24,7 +24,7 @@ end end - xit "solves part 1" do + it "solves part 1", slow: true do reader = AlchemicalReduction.new(puzzle_input) reader.process @@ -55,7 +55,7 @@ expect(lowest[1]).to eq(4) end - xit "solves part 2" do + it "solves part 2", slow: true do counts = {} ('a'..'z').each do |letter| diff --git a/2018/ruby/spec/advent_06_spec.rb b/2018/ruby/spec/advent_06_spec.rb index f33941b..107760d 100644 --- a/2018/ruby/spec/advent_06_spec.rb +++ b/2018/ruby/spec/advent_06_spec.rb @@ -30,18 +30,17 @@ expect(c.largest_area).to eq(17) end - xit "solves part 1" do + it "solves part 1", slow: true do coordinates = puzzle_input.collect do |item| Coordinate.new(item[0], item[1]) end c = ChronalCoordinates.new(coordinates) - # c.print_grid expect(c.largest_area).to eq(3401) end - it "solves part 2" do + it "solves part 2", slow: true do coordinates = puzzle_input.collect do |item| Coordinate.new(item[0], item[1]) end diff --git a/2018/ruby/spec/advent_07_spec.rb b/2018/ruby/spec/advent_07_spec.rb index 4e5dfe9..3a0a584 100644 --- a/2018/ruby/spec/advent_07_spec.rb +++ b/2018/ruby/spec/advent_07_spec.rb @@ -58,7 +58,7 @@ def create_graph(input, weighted = false, seed_weight = 0) expect(orderer.compressed_order).to eq("CABDFE") end - xit "figures out the puzzle order" do + it "figures out the puzzle order", slow: true do graph = create_graph(puzzle_input) orderer = Orderer.new(graph) @@ -76,7 +76,7 @@ def create_graph(input, weighted = false, seed_weight = 0) expect(seconds).to eq(15) end - xit "figures out part 2 puzzle order" do + it "figures out part 2 puzzle order", slow: true do graph = create_graph(puzzle_input, true, 60) orderer = Orderer.new(graph)