From 0f36cf818a31eaa7bd483a090ee04aac8e651b5d Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 2 Jan 2021 13:20:37 +0300 Subject: code style --- .github/workflows/test.yml | 8 +++----- action.yml | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2dcc535..59e4d1f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,11 +62,7 @@ jobs: if ('${{ matrix.platform }}' -eq 'x86') { $flags += '-m32' } - $flags += @( - '-std=c++14', - '-o', 'foo', - 'foo.cpp' - ) + $flags += '-std=c++14','-o','foo','foo.cpp' if ('${{ runner.os }}' -eq 'Linux') { $flags += '-lpthread' } @@ -79,8 +75,10 @@ jobs: Doing something #2 Doing something #3 "@ + $actual = & (Join-Path . foo) $actual = $actual -join [Environment]::NewLine + $($actual -eq $expected) -or $(throw @" Unexpected output: $actual diff --git a/action.yml b/action.yml index 75bf7ef..5a760d7 100644 --- a/action.yml +++ b/action.yml @@ -89,6 +89,7 @@ runs: if ($linux_host) { $pkg = if ($x64) { 'g++' } else { 'g++-multilib' } Install-Package $pkg + Link-Exe -Exe gcc -LinkName cc Link-Exe -Exe g++ -LinkName c++ } elseif ($cygwin_host) { @@ -100,7 +101,9 @@ runs: If you _are_ using 32-bit Cygwin, you can ignore this message. '@ } + Install-Package gcc-g++ + Link-Exe -Exe gcc -LinkName cc Link-Exe -Exe g++ -LinkName c++ } elseif ($windows_host) { -- cgit v1.2.3