From 691a2dc3b1bc616cc0359fb11bdde1991e9dc4a4 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 2 Jan 2021 13:25:10 +0300 Subject: code style --- .github/workflows/test.yml | 8 +++----- action.yml | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b367d81..7348cbe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,11 +63,7 @@ jobs: if ('${{ matrix.platform }}' -eq 'x86') { $flags += '-m32' } - $flags += @( - '-std=c++14', - '-o', 'foo.exe', - 'foo.cpp' - ) + $flags += '-std=c++14','-o','foo.exe','foo.cpp' if ('${{ runner.os }}' -eq 'Linux') { $flags += '-lpthread' } @@ -80,8 +76,10 @@ jobs: Doing something #2 Doing something #3 "@ + $actual = & (Join-Path . foo.exe) $actual = $actual -join [Environment]::NewLine + $($actual -eq $expected) -or $(throw @" Unexpected output: $actual diff --git a/action.yml b/action.yml index 32aab7e..4fde9a5 100644 --- a/action.yml +++ b/action.yml @@ -92,6 +92,7 @@ runs: [Parameter(Mandatory=$true)] [string] $Path ) + $realpath = realpath.exe --no-symlinks -- $Path $dirname = dirname.exe -- $realpath $dirname = cygpath.exe -wa $dirname @@ -108,11 +109,14 @@ runs: $link_path = $Path $link_winpath = Convert-CygwinPath $link_path $link_ext = [System.IO.Path]::GetExtension($link_path) + $dest_path = readlink.exe --canonicalize-existing -- $link_path $dest_winpath = Convert-CygwinPath $dest_path $dest_ext = [System.IO.Path]::GetExtension($dest_path) + echo "Removing symlink: $link_winpath" Remove-Item $link_winpath -Force + if ($dest_ext.ToLower() -ne $link_ext.ToLower()) { $link_winpath += $dest_ext } @@ -139,6 +143,7 @@ runs: If you _are_ using 32-bit Cygwin, please ignore this message. '@ } + # IDK why, but without libiconv-devel, even a "Hello, world!" # C++ app cannot be compiled as of December 2020. Also, libstdc++ # is required; it's simpler to install gcc-g++ for all the -- cgit v1.2.3