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

ruby-changes:73972

From: Takashi <ko1@a...>
Date: Thu, 13 Oct 2022 04:51:31 +0900 (JST)
Subject: [ruby-changes:73972] 166140aa28 (master): YJIT: Set RUST_BACKTRACE=1 in every Cirrus script (#6526)

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

From 166140aa289e6edfd9b023b87c9e6d4434bb29bc Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Wed, 12 Oct 2022 12:50:50 -0700
Subject: YJIT: Set RUST_BACKTRACE=1 in every Cirrus script (#6526)

* YJIT: Set RUST_BACKTRACE=1 in every Cirrus script

* YJIT: Print $CIRRUS_ENV correctly

It looks like $CIRRUS_ENV is cleaned up at every script.
---
 .cirrus.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 854a3df982..cd16548571 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -39,9 +39,8 @@ task: https://github.com/ruby/ruby/blob/trunk/.cirrus.yml#L39
     # the `make` environment variable used in compilers.yml causes some rubygems
     # tests to fail.
     # https://github.com/rubygems/rubygems/issues/4921
-    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> $CIRRUS_ENV
-  print_env_script:
-    - echo "GNUMAKEFLAGS=$GNUMAKEFLAGS"
+    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> "$CIRRUS_ENV"
+    - cat "$CIRRUS_ENV"
   # Arm containers are executed in AWS's EKS, and it's not yet supporting IPv6
   # See https://github.com/aws/containers-roadmap/issues/835
   disable_ipv6_script: sudo ./tool/disable_ipv6.sh
@@ -99,9 +98,9 @@ yjit_task: https://github.com/ruby/ruby/blob/trunk/.cirrus.yml#L98
     # the `make` environment variable used in compilers.yml causes some rubygems
     # tests to fail.
     # https://github.com/rubygems/rubygems/issues/4921
-    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> $CIRRUS_ENV
-  print_env_script:
-    - echo "GNUMAKEFLAGS=$GNUMAKEFLAGS"
+    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> "$CIRRUS_ENV"
+    - echo RUST_BACKTRACE=1 >> "$CIRRUS_ENV"
+    - cat "$CIRRUS_ENV"
   # Arm containers are executed in AWS's EKS, and it's not yet supporting IPv6
   # See https://github.com/aws/containers-roadmap/issues/835
   disable_ipv6_script: sudo ./tool/disable_ipv6.sh
@@ -124,9 +123,9 @@ yjit_task: https://github.com/ruby/ruby/blob/trunk/.cirrus.yml#L123
     else
       echo "only running bindgen on clang image"
     fi
-  boot_miniruby_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 -e0
-  test_dump_insns_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 --yjit-dump-insns -e0
-  output_stats_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 --yjit-stats -e0
+  boot_miniruby_script: ./miniruby --yjit-call-threshold=1 -e0
+  test_dump_insns_script: ./miniruby --yjit-call-threshold=1 --yjit-dump-insns -e0
+  output_stats_script: ./miniruby --yjit-call-threshold=1 --yjit-stats -e0
   full_build_script: source $HOME/.cargo/env && make
   cargo_test_script: source $HOME/.cargo/env && cd yjit && cargo test
   make_test_script: source $HOME/.cargo/env && make test RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
-- 
cgit v1.2.1


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

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