CI: build rpms for centos 7

.github/workflows/fedora.yml

@@ -13,15 +13,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container: ["fedora:31"]
+        container: ["fedora:31", "centos:7"]
         rust_toolchain: [stable]
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
     steps:
-    - name: Install Git
+    - name: Install Sudo
+      shell: bash
+      run: yum install -y sudo
+    - name: Cache Git
+      if: contains(matrix.container, 'centos')
+      uses: actions/cache@v1
+      with:
+        path: /usr/local/git
+        key: ${{ matrix.container }}-git
+    - name: Install Reasonable Git
+      if: contains(matrix.container, 'centos')
       shell: bash
       run: |
-        sudo yum install -y git
+        VERS=2.25.0
+
+        if test ! -x /usr/local/git/bin/git ; then
+        yum install -y wget curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc perl-ExtUtils-MakeMaker make
+        cd /tmp
+        wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-$VERS.tar.gz
+        tar xzf git-$VERS.tar.gz
+        cd git-$VERS
+        make prefix=/usr/local/git install
+        fi
+
+        ln -s /usr/local/git/bin/git /usr/local/bin/git
+    - name: Install System Git
+      if: "!contains(matrix.container, 'centos')"
+      shell: bash
+      run: sudo yum install -y git
     - uses: actions/checkout@v1
     - name: Install System Deps
       run: sudo ./get-deps

.github/workflows/nightly_fedora.yml

@@ -9,15 +9,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container: ["fedora:31"]
+        container: ["fedora:31", "centos:7"]
         rust_toolchain: [stable]
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
     steps:
-    - name: Install Git
+    - name: Install Sudo
+      shell: bash
+      run: yum install -y sudo
+    - name: Cache Git
+      if: contains(matrix.container, 'centos')
+      uses: actions/cache@v1
+      with:
+        path: /usr/local/git
+        key: ${{ matrix.container }}-git
+    - name: Install Reasonable Git
+      if: contains(matrix.container, 'centos')
       shell: bash
       run: |
-        sudo yum install -y git
+        VERS=2.25.0
+
+        if test ! -x /usr/local/git/bin/git ; then
+        yum install -y wget curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc perl-ExtUtils-MakeMaker make
+        cd /tmp
+        wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-$VERS.tar.gz
+        tar xzf git-$VERS.tar.gz
+        cd git-$VERS
+        make prefix=/usr/local/git install
+        fi
+
+        ln -s /usr/local/git/bin/git /usr/local/bin/git
+    - name: Install System Git
+      if: "!contains(matrix.container, 'centos')"
+      shell: bash
+      run: sudo yum install -y git
     - uses: actions/checkout@v1
     - name: Install System Deps
       run: sudo ./get-deps

.github/workflows/tag_fedora.yml

@@ -10,15 +10,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container: ["fedora:31"]
+        container: ["fedora:31", "centos:7"]
         rust_toolchain: [stable]
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
     steps:
-    - name: Install Git
+    - name: Install Sudo
+      shell: bash
+      run: yum install -y sudo
+    - name: Cache Git
+      if: contains(matrix.container, 'centos')
+      uses: actions/cache@v1
+      with:
+        path: /usr/local/git
+        key: ${{ matrix.container }}-git
+    - name: Install Reasonable Git
+      if: contains(matrix.container, 'centos')
       shell: bash
       run: |
-        sudo yum install -y git
+        VERS=2.25.0
+
+        if test ! -x /usr/local/git/bin/git ; then
+        yum install -y wget curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc perl-ExtUtils-MakeMaker make
+        cd /tmp
+        wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-$VERS.tar.gz
+        tar xzf git-$VERS.tar.gz
+        cd git-$VERS
+        make prefix=/usr/local/git install
+        fi
+
+        ln -s /usr/local/git/bin/git /usr/local/bin/git
+    - name: Install System Git
+      if: "!contains(matrix.container, 'centos')"
+      shell: bash
+      run: sudo yum install -y git
     - uses: actions/checkout@v1
     - name: Install System Deps
       run: sudo ./get-deps

ci/deploy.sh

@@ -81,6 +81,7 @@ echo "Doing the build bit here"
 
 %install
 set -x
+cd ${HERE}
 mkdir -p %{buildroot}/usr/bin %{buildroot}/usr/share/wezterm/colors %{buildroot}/usr/share/applications
 install -Dsm755 target/release/wezterm %{buildroot}/usr/bin
 install -Dm644 assets/icon/terminal.png %{buildroot}/usr/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
@@ -96,7 +97,7 @@ install -Dm644 assets/wezterm.appdata.xml %{buildroot}/usr/share/metainfo/wezter
 /usr/share/metainfo/wezterm.appdata.xml
 EOF
 
-        /usr/bin/rpmbuild --build-in-place -bb --rmspec wezterm.spec --verbose
+        /usr/bin/rpmbuild -bb --rmspec wezterm.spec --verbose
 
         ;;
       Ubuntu*|Debian*)

get-deps

@@ -4,10 +4,13 @@
 if test -e /etc/centos-release || test -e /etc/fedora-release; then
   yum install -y \
     make \
+    gcc \
     g++ \
+    gcc-c++ \
     dbus-devel \
     fontconfig-devel \
     openssl-devel \
+    python3 \
     libxcb-devel \
     libxkbcommon-devel \
     libxkbcommon-x11-devel \