Skip to content

Commit

Permalink
Merge pull request #1132 from rust-lang/maint
Browse files Browse the repository at this point in the history
  • Loading branch information
shepmaster authored Jan 14, 2025
2 parents b352356 + d9a98ca commit ab0646d
Show file tree
Hide file tree
Showing 17 changed files with 993 additions and 792 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Configure Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.2
ruby-version: 3.3.6
- name: Cache bundler intermediate products
uses: actions/cache@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion ci/Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# frozen_string_literal: true
source "https://rubygems.org"
ruby "3.0.2"
ruby "3.3.6"
2 changes: 1 addition & 1 deletion ci/generate
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require 'psych'

workflows_path = Pathname.new(__dir__).join('..', '.github', 'workflows')

workflows = Psych.load_file("workflows.yml")
workflows = Psych.load_file("workflows.yml", aliases: true)
workflows['workflows'].each do |k, v|
# Roundtrip through JSON to perform a deep clone of the value.
# If we don't, then anchors are preserved from the input file
Expand Down
2 changes: 1 addition & 1 deletion ci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ workflows:
- name: "Configure Ruby"
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0.2'
ruby-version: '3.3.6'

- name: "Cache bundler intermediate products"
uses: actions/cache@v4
Expand Down
Loading

0 comments on commit ab0646d

Please sign in to comment.