update actions to build emacs-28.2-mac-9.1

railwaycat · Sep 15, 2022 · 3db81fc · 3db81fc
1 parent b328061
commit 3db81fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/emacs.yml b/.github/workflows/emacs.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-10.15]
+        os: [macos-12, macos-11]
     steps:
       - uses: actions/checkout@v3
 
@@ -21,10 +21,10 @@ jobs:
       - name: build and pack
         run: |
           pushd build-scripts
-          ./fetch-emacs-mac-port.sh "28.1-mac-9.0"
-          ./build-emacs.sh emacs-source "28.1"
+          ./fetch-emacs-mac-port.sh "28.2-mac-9.1"
+          ./build-emacs.sh emacs-source "28.2"
           pushd emacs-source; ../copylib.rb $(brew --prefix); popd
-          ./make-zipball.sh emacs-source/tmproot "28.1-mac-9.0"
+          ./make-zipball.sh emacs-source/tmproot "28.2-mac-9.1"
           ls -d $PWD/emacs-source/tmproot/*.zip
           popd
 
@@ -34,7 +34,7 @@ jobs:
           name: ${{ matrix.os }}-${{ env.REL_DATE }}
           draft: true
           files: |
-            build-scripts/emacs-source/tmproot/emacs-28.1-mac-9.0-${{ env.OS_VER }}.zip
-            build-scripts/emacs-source/tmproot/emacs-28.1-mac-9.0-${{ env.OS_VER }}-spacemacs-icon.zip
+            build-scripts/emacs-source/tmproot/emacs-28.2-mac-9.1-${{ env.OS_VER }}.zip
+            build-scripts/emacs-source/tmproot/emacs-28.2-mac-9.1-${{ env.OS_VER }}-spacemacs-icon.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build-scripts/build-emacs.sh b/build-scripts/build-emacs.sh
@@ -2,11 +2,9 @@
 
 source_dir=$1
 installprefix=`pwd`/$source_dir/tmproot
-app_dir=$installprefix/Emacs.app/Contents/Resources
 emacs_version=$2
-compver=x86_64-apple-darwin`uname -r`
 
-export PATH="/usr/local/opt/texinfo/bin:$PATH"
+export PATH="/opt/homebrew/opt/texinfo/bin:/usr/local/opt/texinfo/bin:$PATH"
 
 set -e
 cd $source_dir

diff --git a/build-scripts/verbose-shell.rb b/build-scripts/verbose-shell.rb
@@ -33,7 +33,7 @@ def self.chmod(mode,list,options={})
 
   def self.cp(src,dest,options={})
     system_trace *%W"cp #{src} #{dest}"
-    FileUtils.cp(src, dest, options)
+    FileUtils.cp(src, dest)
   end
 
   def self.cp_r(src,dest,options={})
@@ -53,7 +53,7 @@ def self.rm_rf(file,options={})
 
   def self.mkdir_p(file,options={})
     system_trace *%W"mkdir -p #{file}"
-    FileUtils.mkdir_p file, options
+    FileUtils.mkdir_p file
   end
 
   def self.chdir(dir)