From 5c7adf0534ce2c9683308d7ada8ee93cd01a1b01 Mon Sep 17 00:00:00 2001 From: Rory OConnell <19547+RoryO@users.noreply.github.com> Date: Sun, 5 Jul 2020 20:59:49 -0700 Subject: separate build and test steps, remove MSC --- .github/workflows/build.yml | 51 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 26 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c6fa34b4..392ec7c1c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,8 +9,10 @@ jobs: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf - - name: build and test - run: rake -m -j4 all test + - name: build + run: rake -m -j4 all + - name: test + run: rake test env: MRUBY_CONFIG: travis_config.rb @@ -20,8 +22,10 @@ jobs: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf gcc g++ - - name: build and test - run: rake -m -j4 all test + - name: build + run: rake -m -j4 all + - name: test + run: rake test env: MRUBY_CONFIG: travis_config.rb CC: gcc @@ -33,8 +37,10 @@ jobs: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf - - name: build and test - run: rake -m -j4 all test + - name: build + run: rake -m -j4 all + - name: test + run: rake test env: MRUBY_CONFIG: travis_config.rb CC: clang @@ -46,8 +52,10 @@ jobs: - uses: actions/checkout@v1 - name: brew run: brew install ruby gperf - - name: build and test - run: rake -m -j4 all test + - name: build + run: rake -m -j4 all + - name: test + run: rake test env: MRUBY_CONFIG: travis_config.rb @@ -57,8 +65,10 @@ jobs: - uses: actions/checkout@v1 - name: chocolatey run: choco install -y ruby gperf - - name: build and test - run: rake -E '$stdout.sync=true' -j4 test + - name: build + run: rake -E '$stdout.sync=true' -m -j4 + - name: test + run: rake -E 'STDOUT.sync=true' test env: MRUBY_CONFIG: travis_config.rb CFLAGS: -g -O1 -Wall -Wundef @@ -82,22 +92,11 @@ jobs: - name: Set ENV run: | echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin' - - name: build and test + - name: build shell: cmd - run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -m -j4 -E 'STDOUT.sync=true' test - env: - MRUBY_CONFIG: travis_config.rb - - Windows-VC: - runs-on: windows-latest - steps: - - uses: actions/checkout@v1 - - name: chocolatey - run: choco install -y ruby gperf - - name: build and test + run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -m -j4 -E 'STDOUT.sync=true' + - name: test shell: cmd - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - rake -E "STDOUT.sync=true" -m -j4 test + run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' test env: - MRUBY_CONFIG: appveyor_config.rb + MRUBY_CONFIG: travis_config.rb -- cgit v1.2.3 From 4d393d5d09f73064fed931f2cbb2347fb03373d1 Mon Sep 17 00:00:00 2001 From: Rory OConnell <19547+RoryO@users.noreply.github.com> Date: Sun, 5 Jul 2020 21:05:27 -0700 Subject: use correct config file --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 392ec7c1c..8e990dc85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,4 +99,4 @@ jobs: shell: cmd run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' test env: - MRUBY_CONFIG: travis_config.rb + MRUBY_CONFIG: appveyor_config.rb -- cgit v1.2.3 From b3dace6ae3d28417bf7061a560671734a5568de5 Mon Sep 17 00:00:00 2001 From: Rory OConnell <19547+RoryO@users.noreply.github.com> Date: Sun, 5 Jul 2020 21:12:04 -0700 Subject: use verbose test output. use correct config file this time --- .github/workflows/build.yml | 10 +++++----- appveyor.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e990dc85..8f6f73c61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - name: build run: rake -m -j4 all - name: test - run: rake test + run: rake test -v env: MRUBY_CONFIG: travis_config.rb @@ -25,7 +25,7 @@ jobs: - name: build run: rake -m -j4 all - name: test - run: rake test + run: rake test -v env: MRUBY_CONFIG: travis_config.rb CC: gcc @@ -40,7 +40,7 @@ jobs: - name: build run: rake -m -j4 all - name: test - run: rake test + run: rake test -v env: MRUBY_CONFIG: travis_config.rb CC: clang @@ -55,7 +55,7 @@ jobs: - name: build run: rake -m -j4 all - name: test - run: rake test + run: rake test -v env: MRUBY_CONFIG: travis_config.rb @@ -99,4 +99,4 @@ jobs: shell: cmd run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' test env: - MRUBY_CONFIG: appveyor_config.rb + MRUBY_CONFIG: travis_config.rb diff --git a/appveyor.yml b/appveyor.yml index 93c40dbb1..888261855 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,4 +41,4 @@ init: build_script: - set MRUBY_CONFIG=appveyor_config.rb - rake -E "$stdout.sync=true" -m -j4 - - rake test + - rake test -v -- cgit v1.2.3 From b75974689089396ed22c8ef3ecd80355b40bf80f Mon Sep 17 00:00:00 2001 From: Rory OConnell <19547+RoryO@users.noreply.github.com> Date: Sun, 5 Jul 2020 21:37:20 -0700 Subject: try not separating build and test steps --- .github/workflows/build.yml | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f6f73c61..91a82b4db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,8 @@ jobs: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf - - name: build - run: rake -m -j4 all - - name: test - run: rake test -v + - name: build and test + run: rake -v test env: MRUBY_CONFIG: travis_config.rb @@ -22,10 +20,8 @@ jobs: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf gcc g++ - - name: build - run: rake -m -j4 all - - name: test - run: rake test -v + - name: build and test + run: rake -v test env: MRUBY_CONFIG: travis_config.rb CC: gcc @@ -37,10 +33,8 @@ jobs: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf - - name: build - run: rake -m -j4 all - - name: test - run: rake test -v + - name: build and test + run: rake -v test env: MRUBY_CONFIG: travis_config.rb CC: clang @@ -52,10 +46,8 @@ jobs: - uses: actions/checkout@v1 - name: brew run: brew install ruby gperf - - name: build - run: rake -m -j4 all - - name: test - run: rake test -v + - name: build and test + run: rake -v test env: MRUBY_CONFIG: travis_config.rb @@ -66,9 +58,7 @@ jobs: - name: chocolatey run: choco install -y ruby gperf - name: build - run: rake -E '$stdout.sync=true' -m -j4 - - name: test - run: rake -E 'STDOUT.sync=true' test + run: rake -E 'STDOUT.sync=true' -v test env: MRUBY_CONFIG: travis_config.rb CFLAGS: -g -O1 -Wall -Wundef @@ -92,11 +82,8 @@ jobs: - name: Set ENV run: | echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin' - - name: build - shell: cmd - run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -m -j4 -E 'STDOUT.sync=true' - - name: test + - name: build and test shell: cmd - run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' test + run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' -v test env: MRUBY_CONFIG: travis_config.rb -- cgit v1.2.3 From 3a79d6051506da5a830d3272b3075440debf2733 Mon Sep 17 00:00:00 2001 From: Rory OConnell <19547+RoryO@users.noreply.github.com> Date: Tue, 7 Jul 2020 11:18:44 -0700 Subject: fix rake -m for separating build and test steps --- .github/workflows/build.yml | 55 ++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 21 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91a82b4db..934460b73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,51 +5,59 @@ on: [push, pull_request] jobs: Ubuntu-1604: runs-on: ubuntu-16.04 + env: + MRUBY_CONFIG: travis_config.rb steps: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf - - name: build and test - run: rake -v test - env: - MRUBY_CONFIG: travis_config.rb + - name: build + run: rake -m + - name: test + run: rake test -v Ubuntu-1804-gcc: runs-on: ubuntu-18.04 + env: + MRUBY_CONFIG: travis_config.rb + CC: gcc + CXX: g++ steps: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf gcc g++ - - name: build and test - run: rake -v test - env: - MRUBY_CONFIG: travis_config.rb - CC: gcc - CXX: g++ + - name: build + run: rake -m + - name: test + run: rake test -v Ubuntu-1804-clang: runs-on: ubuntu-18.04 + env: + MRUBY_CONFIG: travis_config.rb + CC: clang + CXX: clang++ steps: - uses: actions/checkout@v1 - name: apt run: sudo apt install ruby gperf - - name: build and test - run: rake -v test - env: - MRUBY_CONFIG: travis_config.rb - CC: clang - CXX: clang++ + - name: build + run: rake -m + - name: test + run: rake test -v macOS: runs-on: macos-latest + env: + MRUBY_CONFIG: travis_config.rb steps: - uses: actions/checkout@v1 - name: brew run: brew install ruby gperf - - name: build and test - run: rake -v test - env: - MRUBY_CONFIG: travis_config.rb + - name: build + run: rake -m + - name: test + run: rake test -v Windows-MinGW: runs-on: windows-latest @@ -82,7 +90,12 @@ jobs: - name: Set ENV run: | echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin' - - name: build and test + - name: build + shell: cmd + run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' -m + env: + MRUBY_CONFIG: travis_config.rb + - name: test shell: cmd run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' -v test env: -- cgit v1.2.3 From 8a44903992475bf11f375f7a732e933d2a628fc5 Mon Sep 17 00:00:00 2001 From: Rory OConnell <19547+RoryO@users.noreply.github.com> Date: Tue, 7 Jul 2020 17:34:26 -0700 Subject: remove verbose test output --- .github/workflows/build.yml | 12 ++++++------ appveyor.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 934460b73..335c0cdf6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: build run: rake -m - name: test - run: rake test -v + run: rake test Ubuntu-1804-gcc: runs-on: ubuntu-18.04 @@ -29,7 +29,7 @@ jobs: - name: build run: rake -m - name: test - run: rake test -v + run: rake test Ubuntu-1804-clang: runs-on: ubuntu-18.04 @@ -44,7 +44,7 @@ jobs: - name: build run: rake -m - name: test - run: rake test -v + run: rake test macOS: runs-on: macos-latest @@ -57,7 +57,7 @@ jobs: - name: build run: rake -m - name: test - run: rake test -v + run: rake test Windows-MinGW: runs-on: windows-latest @@ -66,7 +66,7 @@ jobs: - name: chocolatey run: choco install -y ruby gperf - name: build - run: rake -E 'STDOUT.sync=true' -v test + run: rake -E 'STDOUT.sync=true' test env: MRUBY_CONFIG: travis_config.rb CFLAGS: -g -O1 -Wall -Wundef @@ -97,6 +97,6 @@ jobs: MRUBY_CONFIG: travis_config.rb - name: test shell: cmd - run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' -v test + run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' test env: MRUBY_CONFIG: travis_config.rb diff --git a/appveyor.yml b/appveyor.yml index 888261855..93c40dbb1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,4 +41,4 @@ init: build_script: - set MRUBY_CONFIG=appveyor_config.rb - rake -E "$stdout.sync=true" -m -j4 - - rake test -v + - rake test -- cgit v1.2.3