Skip to content

Commit 0f0c969

Browse files
authored
Merge branch 'master' into prevent-warnings
2 parents ef77445 + df1c9a0 commit 0f0c969

File tree

4 files changed

+5
-19
lines changed

4 files changed

+5
-19
lines changed

.github/workflows/bundled_gems.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,15 @@ jobs:
5959
id: bundled_gems
6060
run: |
6161
ruby -i~ tool/update-bundled_gems.rb gems/bundled_gems >> $GITHUB_OUTPUT
62+
if: ${{ env.UPDATE_NEWS_ENABLED == 'true' }}
6263

6364
- name: Update spec/bundler/support/builders.rb
6465
run: |
6566
#!ruby
6667
rake_version = File.read("gems/bundled_gems")[/^rake\s+(\S+)/, 1]
6768
print ARGF.read.sub(/^ *def rake_version\s*\K".*?"/) {rake_version.dump}
6869
shell: ruby -i~ {0} spec/bundler/support/builders.rb
70+
if: ${{ env.UPDATE_NEWS_ENABLED == 'true' }}
6971

7072
- name: Maintain updated gems list in NEWS
7173
run: |

NEWS.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,8 @@ The following bundled gems are updated.
378378
* 2.0.5 to [v3.0.0][power_assert-v3.0.0], [v3.0.1][power_assert-v3.0.1]
379379
* rake 13.3.1
380380
* 13.2.1 to [v13.3.0][rake-v13.3.0], [v13.3.1][rake-v13.3.1]
381-
* test-unit 3.7.5
382-
* 3.6.7 to [3.6.8][test-unit-3.6.8], [3.6.9][test-unit-3.6.9], [3.7.0][test-unit-3.7.0], [3.7.1][test-unit-3.7.1], [3.7.2][test-unit-3.7.2], [3.7.3][test-unit-3.7.3], [3.7.4][test-unit-3.7.4], [3.7.5][test-unit-3.7.5]
381+
* test-unit 3.7.3
382+
* 3.6.7 to [3.6.8][test-unit-3.6.8], [3.6.9][test-unit-3.6.9], [3.7.0][test-unit-3.7.0], [3.7.1][test-unit-3.7.1], [3.7.2][test-unit-3.7.2], [3.7.3][test-unit-3.7.3]
383383
* rexml 3.4.4
384384
* rss 0.3.2
385385
* 0.3.1 to [0.3.2][rss-0.3.2]
@@ -755,8 +755,6 @@ A lot of work has gone into making Ractors more stable, performant, and usable.
755755
[test-unit-3.7.1]: https://github.com/test-unit/test-unit/releases/tag/3.7.1
756756
[test-unit-3.7.2]: https://github.com/test-unit/test-unit/releases/tag/3.7.2
757757
[test-unit-3.7.3]: https://github.com/test-unit/test-unit/releases/tag/3.7.3
758-
[test-unit-3.7.4]: https://github.com/test-unit/test-unit/releases/tag/3.7.4
759-
[test-unit-3.7.5]: https://github.com/test-unit/test-unit/releases/tag/3.7.5
760758
[rss-0.3.2]: https://github.com/ruby/rss/releases/tag/0.3.2
761759
[net-ftp-v0.3.9]: https://github.com/ruby/net-ftp/releases/tag/v0.3.9
762760
[net-imap-v0.5.9]: https://github.com/ruby/net-imap/releases/tag/v0.5.9

gems/bundled_gems

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
minitest 6.0.0 https://github.com/minitest/minitest
1010
power_assert 3.0.1 https://github.com/ruby/power_assert
1111
rake 13.3.1 https://github.com/ruby/rake
12-
test-unit 3.7.5 https://github.com/test-unit/test-unit
12+
test-unit 3.7.3 https://github.com/test-unit/test-unit
1313
rexml 3.4.4 https://github.com/ruby/rexml
1414
rss 0.3.2 https://github.com/ruby/rss
1515
net-ftp 0.3.9 https://github.com/ruby/net-ftp

win32/win32.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6737,20 +6737,6 @@ constat_handle(HANDLE h)
67376737
return p;
67386738
}
67396739

6740-
/* License: Ruby's */
6741-
static void
6742-
constat_reset(HANDLE h)
6743-
{
6744-
st_data_t data;
6745-
struct constat *p;
6746-
thread_exclusive(conlist) {
6747-
if (!conlist || conlist == conlist_disabled) continue;
6748-
if (!st_lookup(conlist, (st_data_t)h, &data)) continue;
6749-
p = (struct constat *)data;
6750-
p->vt100.state = constat_init;
6751-
}
6752-
}
6753-
67546740
#define FOREGROUND_MASK (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY)
67556741
#define BACKGROUND_MASK (BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY)
67566742

0 commit comments

Comments
 (0)