Browse Source

ci: update os runner

main
Kien Nguyen 3 months ago
parent
commit
749c184111
  1. 8
      .github/workflows/build.yml
  2. 7
      emacs-build-unix.sh

8
.github/workflows/build.yml

@ -46,13 +46,13 @@ jobs:
fail-fast: false
matrix:
include:
- os: windows-latest
- os: windows-2022
shell: powershell
msystem: MINGW64
- os: windows-latest
- os: windows-2022
shell: powershell
msystem: UCRT64
- os: ubuntu-latest
- os: ubuntu-22.04
shell: bash
# The type of runner that the job will run on
@ -115,7 +115,7 @@ jobs:
run: |
chmod 755 ./emacs-build-unix.sh
mkdir -p ./zips
./emacs-build-unix.sh -s ./git/emacs/ -v ${{ needs.prepare_env.outputs.version }} -d ./zips --with-mps --without-xwidgets
./emacs-build-unix.sh -s ./git/emacs/ -v ${{ needs.prepare_env.outputs.version }} -d ./zips --with-mps --with-xinput2 --without-xwidgets
# Upload release for each build
- name: Upload binaries to release

7
emacs-build-unix.sh

@ -36,10 +36,11 @@ render_deps=",librsvg2-2,libxpm4,libjpeg9,libgif7,libpng16-16,libgtk-3-0,libharf
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
sudo apt update
# libtree-sitter-dev is only supported from Jammy (22.04)
sudo apt install -y dpkg-dev autoconf make texinfo $render_libs libgnutls28-dev \
libncurses5-dev libsystemd-dev libjansson-dev libgccjit-10-dev g++-10 gcc-10 libxt-dev \
libncurses5-dev libsystemd-dev libgccjit-11-dev gcc-11 libxt-dev \
libtree-sitter-dev libwebkit2gtk-4.0-dev curl
export CC=/usr/bin/gcc-10 CXX=/usr/bin/gcc-10
export CC=/usr/bin/gcc-11 CXX=/usr/bin/gcc-11
./autogen.sh
@ -79,7 +80,7 @@ Version: $emacs_pkg_version
Architecture: $arch
Maintainer: www.gnu.org/software/emacs/
Description: GNU Emacs
Depends: libjansson4,libncurses5,libgccjit0,libtree-sitter0,libwebkit2gtk-4.0-37${render_deps}
Depends: libncurses5,libgccjit0,libtree-sitter0,libwebkit2gtk-4.0-37${render_deps}
EOF
dpkg-deb --build -z9 --root-owner-group $deb_dir $emacs_dest_dir

Loading…
Cancel
Save