automation: build-release.yaml: install ninja-build on Linux

dylan-lang · Feb 11, 2024 · 11ac153 · 11ac153
1 parent 6e308d8
commit 11ac153
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -17,6 +17,9 @@ jobs:
 
       - name: Install Dependencies
         run: |
+            if [ "$RUNNER_OS" == "Linux" ]; then
+              sudo apt-get install ninja-build
+            fi
             if [ "$RUNNER_OS" == "macOS" ]; then
               brew install autoconf automake ninja
             fi

diff --git a/Makefile.in b/Makefile.in
@@ -360,7 +360,7 @@ dist: 3-stage-bootstrap
 	cp $(srcdir)/BUILDING.rst release/opendylan-$(version)/
 	cd release \
 	  && tar cjf opendylan-$(version)-$(TARGET_PLATFORM).tar.bz2 opendylan-$(version) \
-	  && ln -s opendylan.tar.bz2 opendylan-$(version)-$(TARGET_PLATFORM).tar.bz2
+	  && ln -s opendylan-$(version)-$(TARGET_PLATFORM).tar.bz2 opendylan.tar.bz2
 
 
 TEST_LIBS = \

diff --git a/build/fdmake.pl b/build/fdmake.pl
@@ -263,9 +263,10 @@ sub build_library {
     if ($failed) {
         print "\n";
         if(defined $build_logs && !$debugger) {
-            print STDERR
-                "fdmake: compile failed ($?), see ",
-                File::Spec->catfile($build_logs, "compile-$library.txt"), "\n";
+            my $log = File::Spec->catfile($build_logs, "compile-$library.txt");
+            my $cmd = "/bin/cat $log";
+            system($cmd) or die "Couldn't execute $command";
+            print STDERR "fdmake: compile failed ($?), see ", $log, "\n";
         }
         else {
             print STDERR "fdmake: compile failed\n";