[前][次][番号順一覧][スレッド一覧]

ruby-changes:69632

From: Nobuyoshi <ko1@a...>
Date: Sun, 7 Nov 2021 22:37:25 +0900 (JST)
Subject: [ruby-changes:69632] dc4dd96b02 (master): [MinGW] Remove unnecessary encoding settings

https://git.ruby-lang.org/ruby.git/commit/?id=dc4dd96b02

From dc4dd96b028adf8fe59cdd5fb1f173efb0974e7f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 7 Nov 2021 15:43:11 +0900
Subject: [MinGW] Remove unnecessary encoding settings

---
 .github/workflows/mingw.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index d1083ae4b10..a1fecb38bef 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -81,10 +81,6 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L81
 
       - name: configure
         run: |
-          # Actions uses UTF8, causes test failures, similar to normal OS setup
-          $PSDefaultParameterValues['*:Encoding'] = 'utf8'
-          [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
-          [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
           $config_args = "--build=$env:CHOST --host=$env:CHOST --target=$env:CHOST"
           Write-Host $config_args
           sh -c "../src/configure --disable-install-doc --prefix=/. $config_args"
@@ -108,10 +104,6 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L104
 
       - name: make install
         run: |
-          # Actions uses UTF8, causes test failures, similar to normal OS setup
-          $PSDefaultParameterValues['*:Encoding'] = 'utf8'
-          [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
-          [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
           make DESTDIR=../install install-nodoc
 
       - name: test
@@ -123,9 +115,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L115
         timeout-minutes: 40
         run: |
           # Actions uses UTF8, causes test failures, similar to normal OS setup
-          $PSDefaultParameterValues['*:Encoding'] = 'utf8'
-          [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
-          [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
+          chcp.com 437
           if ($env:BUNDLER_VERSION) { Remove-Item env:\BUNDLER_VERSION }
           make test-all TESTOPTS="-j $env:TEST_JOBS --retry --job-status=normal --show-skip --timeout-scale=1.5"
 
@@ -134,10 +124,6 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L124
         working-directory: src/spec/ruby
         run: |
           $env:Path = "$pwd/../../../install/bin;$env:Path"
-          # Actions uses UTF8, causes test failures, similar to normal OS setup
-          $PSDefaultParameterValues['*:Encoding'] = 'utf8'
-          [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
-          [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
           ruby -v
           ruby ../mspec/bin/mspec -I../../tool/lib -j --timeout 60
 
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]