ci: restore centos7

It was removed in be1b54ba33 citing difficulties with GH CLI, but I think I subsequently solved that by not running it in the container. refs: https://github.com/wez/wezterm/issues/1947 refs: https://github.com/wez/wezterm/issues/1948
2024-12-22 21:01:36 +03:00 · 2022-05-10 21:23:56 -07:00 · 2022-05-10 21:23:56 -07:00 · 7e460c3784
commit 7e460c3784
parent ea7571734f
6 changed files with 349 additions and 3 deletions
--- a/.github/workflows/gen_centos7.yml
+++ b/.github/workflows/gen_centos7.yml
@ -0,0 +1,101 @@
+name: centos7
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - ".cirrus.yml"
+      - "docs/*"
+      - "ci/build-docs.sh"
+      - "ci/generate-docs.py"
+      - "ci/subst-release-info.py"
+      - ".github/workflows/pages.yml"
+      - ".github/workflows/verify-pages.yml"
+      - ".github/workflows/no-response.yml"
+      - ".github/ISSUE_TEMPLATE/*"
+      - "**/*.md"
+      - "**/*.markdown"
+
+jobs:
+  build:
+    runs-on: "ubuntu-latest"
+    container: "quay.io/centos/centos:centos7"
+
+    steps:
+      - name: "Install SCL"
+        shell: bash
+        run: "yum install -y centos-release-scl-rh"
+      - name: "Update compiler"
+        shell: bash
+        run: "yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++"
+      - name: "Cache Git installation"
+        uses: actions/cache@v3
+        with:
+          path: "/usr/local/git"
+          key: "centos7-git-2.26.2"
+      - name: "Install Git from source"
+        shell: bash
+        run: |
+          yum install -y wget curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc perl-ExtUtils-MakeMaker make
+          if test ! -x /usr/local/git/bin/git ; then
+              cd /tmp
+              wget https://github.com/git/git/archive/v2.26.2.tar.gz
+              tar xzf v2.26.2.tar.gz
+              cd git-2.26.2
+              make prefix=/usr/local/git install
+          fi
+          ln -s /usr/local/git/bin/git /usr/local/bin/git
+      - name: "Install curl"
+        shell: bash
+        run: "yum install -y curl"
+      - name: "Ensure /run/sshd exists"
+        shell: bash
+        run: "mkdir -p /run/sshd"
+      - name: "Install openssh-server"
+        shell: bash
+        run: "yum install -y openssh-server"
+      - name: "Workaround git permissions issue"
+        shell: bash
+        run: "git config --global --add safe.directory /__w/wezterm/wezterm"
+      - name: "checkout repo"
+        uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+      - name: "Install Rust"
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: "minimal"
+          toolchain: "stable"
+          override: true
+          components: "rustfmt"
+        env:
+          ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
+      - name: "Cache cargo"
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: "centos7-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
+      - name: "Install System Deps"
+        shell: bash
+        run: "env PATH=$PATH ./get-deps"
+      - name: "Build (Release mode)"
+        shell: bash
+        run: "source /opt/rh/devtoolset-9/enable && cargo build --all --release"
+      - name: "Test (Release mode)"
+        shell: bash
+        run: "source /opt/rh/devtoolset-9/enable && cargo test --all --release"
+      - name: "Package"
+        shell: bash
+        run: "bash ci/deploy.sh"
+      - name: "Move RPM"
+        shell: bash
+        run: "mv ~/rpmbuild/RPMS/*/*.rpm ."
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@v3
+        with:
+          name: "centos7"
+          path: "wezterm-*.rpm"
--- a/.github/workflows/gen_centos7_continuous.yml
+++ b/.github/workflows/gen_centos7_continuous.yml
@ -0,0 +1,126 @@
+name: centos7_continuous
+
+on:
+  schedule:
+    - cron: "10 3 * * *"
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - ".cirrus.yml"
+      - "docs/**"
+      - "ci/build-docs.sh"
+      - "ci/generate-docs.py"
+      - "ci/subst-release-info.py"
+      - ".github/workflows/pages.yml"
+      - ".github/workflows/verify-pages.yml"
+      - ".github/workflows/no-response.yml"
+      - ".github/ISSUE_TEMPLATE/*"
+      - "**/*.md"
+      - "**/*.markdown"
+
+jobs:
+  build:
+    runs-on: "ubuntu-latest"
+    container: "quay.io/centos/centos:centos7"
+    env:
+      BUILD_REASON: "Schedule"
+
+    steps:
+      - name: "Install SCL"
+        shell: bash
+        run: "yum install -y centos-release-scl-rh"
+      - name: "Update compiler"
+        shell: bash
+        run: "yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++"
+      - name: "Cache Git installation"
+        uses: actions/cache@v3
+        with:
+          path: "/usr/local/git"
+          key: "centos7-git-2.26.2"
+      - name: "Install Git from source"
+        shell: bash
+        run: |
+          yum install -y wget curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc perl-ExtUtils-MakeMaker make
+          if test ! -x /usr/local/git/bin/git ; then
+              cd /tmp
+              wget https://github.com/git/git/archive/v2.26.2.tar.gz
+              tar xzf v2.26.2.tar.gz
+              cd git-2.26.2
+              make prefix=/usr/local/git install
+          fi
+          ln -s /usr/local/git/bin/git /usr/local/bin/git
+      - name: "Install curl"
+        shell: bash
+        run: "yum install -y curl"
+      - name: "Ensure /run/sshd exists"
+        shell: bash
+        run: "mkdir -p /run/sshd"
+      - name: "Install openssh-server"
+        shell: bash
+        run: "yum install -y openssh-server"
+      - name: "Workaround git permissions issue"
+        shell: bash
+        run: "git config --global --add safe.directory /__w/wezterm/wezterm"
+      - name: "checkout repo"
+        uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+      - name: "Install Rust"
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: "minimal"
+          toolchain: "stable"
+          override: true
+          components: "rustfmt"
+        env:
+          ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
+      - name: "Cache cargo"
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: "centos7-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
+      - name: "Install System Deps"
+        shell: bash
+        run: "env PATH=$PATH ./get-deps"
+      - name: "Build (Release mode)"
+        shell: bash
+        run: "source /opt/rh/devtoolset-9/enable && cargo build --all --release"
+      - name: "Test (Release mode)"
+        shell: bash
+        run: "source /opt/rh/devtoolset-9/enable && cargo test --all --release"
+      - name: "Package"
+        shell: bash
+        run: "bash ci/deploy.sh"
+      - name: "Move RPM"
+        shell: bash
+        run: "mv ~/rpmbuild/RPMS/*/*.rpm wezterm-nightly-centos7.rpm"
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@v3
+        with:
+          name: "centos7"
+          path: "wezterm-*.rpm"
+          retention-days: 5
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - name: "Workaround git permissions issue"
+        shell: bash
+        run: "git config --global --add safe.directory /__w/wezterm/wezterm"
+      - name: "checkout repo"
+        uses: actions/checkout@v3
+      - name: "Download artifact"
+        uses: actions/download-artifact@v3
+        with:
+          name: "centos7"
+      - name: "Upload to Nightly Release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: "bash ci/retry.sh gh release upload --clobber nightly wezterm-*.rpm"
--- a/.github/workflows/gen_centos7_tag.yml
+++ b/.github/workflows/gen_centos7_tag.yml
@ -0,0 +1,116 @@
+name: centos7_tag
+
+on:
+  push:
+    tags:
+      - "20*"
+
+jobs:
+  build:
+    runs-on: "ubuntu-latest"
+    container: "quay.io/centos/centos:centos7"
+    env:
+      BUILD_REASON: "Schedule"
+
+    steps:
+      - name: "Install SCL"
+        shell: bash
+        run: "yum install -y centos-release-scl-rh"
+      - name: "Update compiler"
+        shell: bash
+        run: "yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++"
+      - name: "Cache Git installation"
+        uses: actions/cache@v3
+        with:
+          path: "/usr/local/git"
+          key: "centos7-git-2.26.2"
+      - name: "Install Git from source"
+        shell: bash
+        run: |
+          yum install -y wget curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc perl-ExtUtils-MakeMaker make
+          if test ! -x /usr/local/git/bin/git ; then
+              cd /tmp
+              wget https://github.com/git/git/archive/v2.26.2.tar.gz
+              tar xzf v2.26.2.tar.gz
+              cd git-2.26.2
+              make prefix=/usr/local/git install
+          fi
+          ln -s /usr/local/git/bin/git /usr/local/bin/git
+      - name: "Install curl"
+        shell: bash
+        run: "yum install -y curl"
+      - name: "Ensure /run/sshd exists"
+        shell: bash
+        run: "mkdir -p /run/sshd"
+      - name: "Install openssh-server"
+        shell: bash
+        run: "yum install -y openssh-server"
+      - name: "Workaround git permissions issue"
+        shell: bash
+        run: "git config --global --add safe.directory /__w/wezterm/wezterm"
+      - name: "checkout repo"
+        uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+      - name: "Install Rust"
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: "minimal"
+          toolchain: "stable"
+          override: true
+          components: "rustfmt"
+        env:
+          ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
+      - name: "Cache cargo"
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: "centos7-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
+      - name: "Install System Deps"
+        shell: bash
+        run: "env PATH=$PATH ./get-deps"
+      - name: "Build (Release mode)"
+        shell: bash
+        run: "source /opt/rh/devtoolset-9/enable && cargo build --all --release"
+      - name: "Test (Release mode)"
+        shell: bash
+        run: "source /opt/rh/devtoolset-9/enable && cargo test --all --release"
+      - name: "Package"
+        shell: bash
+        run: "bash ci/deploy.sh"
+      - name: "Move RPM"
+        shell: bash
+        run: "mv ~/rpmbuild/RPMS/*/*.rpm ."
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@v3
+        with:
+          name: "centos7"
+          path: "wezterm-*.rpm"
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - name: "Workaround git permissions issue"
+        shell: bash
+        run: "git config --global --add safe.directory /__w/wezterm/wezterm"
+      - name: "checkout repo"
+        uses: actions/checkout@v3
+      - name: "Download artifact"
+        uses: actions/download-artifact@v3
+        with:
+          name: "centos7"
+      - name: "Create pre-release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: "bash ci/retry.sh bash ci/create-release.sh $(ci/tag-name.sh)"
+      - name: "Upload to Tagged Release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) wezterm-*.rpm"
--- a/assets/wezterm-nautilus.py
+++ b/assets/wezterm-nautilus.py
@ -47,7 +47,7 @@ class OpenInWezTermAction(GObject.GObject, Nautilus.MenuProvider):
            pid = int(child.get_identifier())
            props = [("PIDs", GLib.Variant('au', [pid])),
                ('CollectMode', GLib.Variant('s', 'inactive-or-failed'))]
-            name = f'app-nautilus-org.wezfurlong.wezterm-{pid}.scope'
+            name = 'app-nautilus-org.wezfurlong.wezterm-{}.scope'.format(pid)
            args = GLib.Variant('(ssa(sv)a(sa(sv)))', (name, 'fail', props, []))
            self._systemd.call_sync('StartTransientUnit', args,
                    Gio.DBusCallFlags.NO_AUTO_START, 500, None)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@ -174,7 +174,7 @@ install -Dm644 assets/wezterm-nautilus.py %{buildroot}/usr/share/nautilus-python
 /usr/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
 /usr/share/applications/org.wezfurlong.wezterm.desktop
 /usr/share/metainfo/org.wezfurlong.wezterm.appdata.xml
-/usr/share/nautilus-python/extensions/wezterm-nautilus.py
+/usr/share/nautilus-python/extensions/wezterm-nautilus.py*
 /etc/profile.d/*
 EOF

--- a/ci/generate-workflows.py
+++ b/ci/generate-workflows.py
@ -626,7 +626,9 @@ cargo build --all --release""",
                    ),
                ]
        if self.container:
-            if ("fedora" in self.container) or ("centos" in self.container):
+            if ("fedora" in self.container) or (
+                ("centos" in self.container) and ("centos7" not in self.container)
+            ):
                steps += [
                    RunStep(
                        "Install config manager",
@ -767,6 +769,7 @@ TARGETS = [
    Target(container="debian:9.12", continuous_only=True, bootstrap_git=True),
    Target(container="debian:10.3", continuous_only=True),
    Target(container="debian:11", continuous_only=True),
+    Target(name="centos7", container="quay.io/centos/centos:centos7", bootstrap_git=True),
    Target(name="centos8", container="quay.io/centos/centos:stream8"),
    Target(name="centos9", container="quay.io/centos/centos:stream9"),
    Target(name="macos", os="macos-11"),