From: Shlomi Fish <shlomif@shlomifish.org>
Date: Mon, 4 Apr 2022 09:45:15 +0000 (+0300)
Subject: gh actions #1: mswin64: investigate
X-Git-Tag: fortune-mod-3.14.0~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f860b6e10c2d30fd2215e8456ab590733e932ff;p=fortune-mod

gh actions #1: mswin64: investigate
---

diff --git a/.appveyor.yml b/.appveyor.yml
index 3895793..995bc94 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,6 +25,10 @@ install:
     - SET PERL_MM_OPT=INSTALL_BASE=C:/Perl5
     - cpanm --notest App::Docmake Code::TidyAll::Plugin::ClangFormat Code::TidyAll::Plugin::Flake8 Code::TidyAll::Plugin::TestCount File::Find::Object List::Util Path::Tiny Perl::Critic Perl::Tidy Test::Code::TidyAll Test::Differences Test::RunValgrind Test::TrailingSpace Test::Trap
     - if not exist C:\libtap mkdir C:\libtap
+    - dir C:\
+    - dir C:\msys64
+    - dir C:\msys64\mingw64
+    - dir C:\msys64\mingw64\bin
     - dir C:\msys64\mingw64\bin\*make*.exe
     - copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe
     # - SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
diff --git a/.github/workflows/windows-x64.yml b/.github/workflows/windows-x64.yml
index b73f682..8b0ead7 100644
--- a/.github/workflows/windows-x64.yml
+++ b/.github/workflows/windows-x64.yml
@@ -79,6 +79,14 @@ jobs:
                 if not exist C:\libtap mkdir C:\libtap || ( echo Failed & exit /B
                 1 )
 
+                dir C:\ || ( echo Failed & exit /B 1 )
+
+                dir C:\msys64 || ( echo Failed & exit /B 1 )
+
+                dir C:\msys64\mingw64 || ( echo Failed & exit /B 1 )
+
+                dir C:\msys64\mingw64\bin || ( echo Failed & exit /B 1 )
+
                 dir C:\msys64\mingw64\bin\*make*.exe || ( echo Failed & exit /B 1
                 )
 
diff --git a/scripts/debian-packaging/build-rinutils-debian-package--using-docker.pl b/scripts/debian-packaging/build-rinutils-debian-package--using-docker.pl
index 9c4e798..db4e8e4 100644
--- a/scripts/debian-packaging/build-rinutils-debian-package--using-docker.pl
+++ b/scripts/debian-packaging/build-rinutils-debian-package--using-docker.pl
@@ -38,7 +38,7 @@ my $script = <<"EOSCRIPTTTTTTT";
 $BASH_SAFETY
 apt-get -y update
 apt-get -y install eatmydata sudo
-sudo eatmydata apt -y install build-essential chrpath cmake git-buildpackage librecode-dev perl recode
+sudo eatmydata apt -y install build-essential chrpath cmake dgit git-buildpackage librecode-dev perl recode
 sudo adduser --disabled-password --gecos '' "$USER"
 sudo usermod -a -G sudo "$USER"
 echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
@@ -58,7 +58,12 @@ $script = <<"EOSCRIPTTTTTTT";
 $BASH_SAFETY
 cd "$HOMEDIR/$REPO"
 git clean -dxf .
-(if ! gbp buildpackage 2>&1 ; then exit 0 || cat /tmp/rinutils*diff* ; exit 1 ; fi) | tee ~/"$LOG_FN"
+(if ! gbp buildpackage 2>&1 ; then cat /tmp/rinutils*diff* || true ; exit 0 ; fi) | tee -a ~/"$LOG_FN"
+(if ! dpkg-buildpackage --changes-option=-S 2>&1 ; then cat /tmp/rinutils*diff* || true; exit 0 ; fi) | tee -a ~/"$LOG_FN"
+( ls -lRA ) | tee -a ~/"$LOG_FN"
+(if ! debuild -i -us -uc -S 2>&1 ; then cat /tmp/rinutils*diff* ; exit 1 ; fi) | tee -a ~/"$LOG_FN"
+( ls -lRA ) | tee -a ~/"$LOG_FN"
+(if ! dgit push-source --gbp 2>&1 ; then exit 0 || cat /tmp/rinutils*diff* ; exit 1 ; fi) | tee -a ~/"$LOG_FN"
 sudo dpkg -i ~/librinutils-dev_0.10.0-2_all.deb
 test -f /usr/include/rinutils/rinutils.h
 test -f /usr/include/rinutils/alloc_wrap.h