Use bash

swift-lang · Sep 5, 2024 · e43ba20 · e43ba20
1 parent e7c4cc1
commit e43ba20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/dev/github-actions/setup-macos-14.sh b/dev/github-actions/setup-macos-14.sh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/bash
 
 # SETUP for matrix.os == macos-14
 
@@ -27,10 +27,11 @@ if (
   brew install $PKGS
 ) >& brew.log
 then
-  log "Installed Homebrew packages in %i seconds."
+  T=$(( SECONDS - START ))
+  log "Installed Homebrew packages in $T seconds."
 else
   log "FAILED to install Homebrew packages!"
   log "brew.log:"
   cat brew.log
-  return 1
+  exit 1
 fi
diff --git a/dev/github-actions/setup-ubuntu-latest.sh b/dev/github-actions/setup-ubuntu-latest.sh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/bash
 
 # SETUP for matrix.os == ubuntu-latest
 
@@ -17,18 +17,18 @@ PKGS=(
   libcurl4-openssl-dev
   make
   tcl-dev
-  zsh
 )
 
 if (
   set -eux
   sudo apt-get install -y $PKGS
 ) >& apt.log
 then
-  log "Installed Ubuntu packages in %i seconds."
+  T=$(( SECONDS - START ))
+  log "Installed Ubuntu packages in $T seconds."
 else
   log "FAILED to install Ubuntu packages!"
   log "apt.log:"
   cat apt.log
-  return 1
+  exit 1
 fi