ruby-changes:72555
From: nagachika <ko1@a...>
Date: Fri, 15 Jul 2022 09:11:34 +0900 (JST)
Subject: [ruby-changes:72555] 736fe48b18 (ruby_3_1): Remove GitHub Actions bundled_gems workflow in stable branch.
https://git.ruby-lang.org/ruby.git/commit/?id=736fe48b18 From 736fe48b18109962a15e36177f13c4bf462875b8 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Fri, 15 Jul 2022 09:10:02 +0900 Subject: Remove GitHub Actions bundled_gems workflow in stable branch. --- .github/workflows/bundled_gems.yml | 131 ------------------------------------- version.h | 4 +- 2 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 .github/workflows/bundled_gems.yml diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml deleted file mode 100644 index 12fb2b06e5..0000000000 --- a/.github/workflows/bundled_gems.yml +++ /dev/null @@ -1,131 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/#L0 -name: bundled_gems - -on: - push: - paths: - - '.github/workflows/bundled_gems.yml' - - 'gems/bundled_gems' - pull_request: - paths: - - '.github/workflows/bundled_gems.yml' - - 'gems/bundled_gems' - schedule: - - cron: '45 6 * * *' - -jobs: - update: - if: ${{ github.event_name != 'schedule' || github.repository == 'ruby/ruby' }} - name: update ${{ github.workflow }} - runs-on: ubuntu-latest - steps: - - name: git config - run: | - git config --global advice.detachedHead 0 - git config --global init.defaultBranch garbage - - - name: Set ENV - run: | - echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV - echo "TODAY=$(date +%F)" >> $GITHUB_ENV - - - uses: actions/checkout@v2 - - - uses: actions/cache@v2 - with: - path: .downloaded-cache - key: downloaded-cache-${{ github.sha }} - restore-keys: | - downloaded-cache - - - name: Download previous gems list - run: | - data=bundled_gems.json - mkdir -p .downloaded-cache - ln -s .downloaded-cache/$data . - curl -O -R -z ./$data https://stdgems.org/$data - - - name: Update bundled gems list - run: | - ruby -i~ tool/update-bundled_gems.rb gems/bundled_gems - - - name: Maintain updated gems list in NEWS - run: | - require 'json' - news = File.read("NEWS.md") - prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1] - prevs = [prev, prev.sub(/\.\d+\z/, '')] - %W[bundled].each do |type| - last = JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g| - v = g['versions'].values_at(*prevs).compact.first - g = g['gem'] - g = 'RubyGems' if g == 'rubygems' - [g, v] if v - end.to_h - changed = File.foreach("gems/#{type}_gems").filter_map do |l| - next if l.start_with?("#") - g, v = l.split(" ", 3) - [g, v] unless last[g] == v - end - changed, added = changed.partition {|g, _| last[g]} - news.sub!(/^\*\s+The following #{type} gems? are updated\.(\n\s+\*\s+)\K.*(?:\1.*)*/) do - changed.map {|g, v|"#{g} #{v}"}.join($1) - end or exit - news.sub!(/^\*\s+The following default gems are now bundled.*(\n\s+\*\s+)\K.*(?:\1.*)*/) do - added.map {|g, v|"#{g} #{v}"}.join($1) - end if added - File.write("NEWS.md", news) - end - shell: ruby {0} - - - name: Check diffs - id: diff - run: | - git add -- NEWS.md - git diff --no-ext-diff --ignore-submodules --quiet -- gems/bundled_gems - continue-on-error: true - - - name: Install libraries - run: | - set -x - sudo apt-get update -q || : - sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev bison autoconf ruby - if: ${{ steps.diff.outcome == 'failure' }} - - - name: Build - run: | - ./autogen.sh - ./configure -C --disable-install-doc - make - if: ${{ steps.diff.outcome == 'failure' }} - - - name: Test bundled gems - run: | - make -s test-bundled-gems - git add -- gems/bundled_gems - timeout-minutes: 30 - env: - RUBY_TESTOPTS: "-q --tty=no" - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" - if: ${{ steps.diff.outcome == 'failure' }} - - - name: Show diffs - id: show - run: | - git diff --cached --color --no-ext-diff --ignore-submodules --exit-code -- - continue-on-error: true - - - name: Commit - run: | - git pull --ff-only origin ${GITHUB_REF#refs/heads/} - message="Update bundled gems list at " - if [ ${{ steps.diff.outcome }} = success ]; then - git commit --message="${message}${GITHUB_SHA:0:30} [ci skip]" - else - git commit --message="${message}${TODAY}" - fi - git push origin ${GITHUB_REF#refs/heads/} - env: - EMAIL: svn-admin@r... - GIT_AUTHOR_NAME: git - GIT_COMMITTER_NAME: git - if: ${{ github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull') && steps.show.outcome == 'failure' }} diff --git a/version.h b/version.h index 3704c20799..13062dd7d2 100644 --- a/version.h +++ b/version.h @@ -11,11 +11,11 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 39 +#define RUBY_PATCHLEVEL 40 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 15 #include "ruby/version.h" -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/