ci: tidy up separate uploader job

Enable it for tags/releases too, and remove some additional git fetches
and installation of the GH CLI inside containers that we no longer need.

.github/workflows/gen_centos8.yml

@@ -25,12 +25,6 @@ jobs:
       - name: "Enable PowerTools"
         shell: bash
         run: "dnf config-manager --set-enabled powertools"
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "dnf install -y gh"
       - name: "Install git"
         shell: bash
         run: "yum install -y git"
@@ -47,12 +41,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -85,13 +73,11 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
+      - name: "Move RPM"
         shell: bash
-        run: |
+        run: "mv ~/rpmbuild/RPMS/*/*.rpm ."
-          mkdir pkg_
-          mv ~/rpmbuild/RPMS/*/*.rpm pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "centos8"
-          path: "pkg_"
+          path: "wezterm-*.rpm"

.github/workflows/gen_centos8_continuous.yml

@@ -31,16 +31,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           dnf config-manager --set-enabled powertools
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          dnf install -y gh
       - name: "Install git"
         shell: bash
         run: |
@@ -65,16 +55,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_centos8_tag.yml

@@ -16,12 +16,6 @@ jobs:
       - name: "Enable PowerTools"
         shell: bash
         run: "dnf config-manager --set-enabled powertools"
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "dnf install -y gh"
       - name: "Install git"
         shell: bash
         run: "yum install -y git"
@@ -38,12 +32,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -81,6 +69,17 @@ jobs:
         with:
           name: "centos8"
           path: "wezterm-*.rpm"
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "centos8"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gen_debian10.3.yml

@@ -34,24 +34,6 @@ jobs:
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install https support for apt"
-        shell: bash
-        run: "apt-get install -y apt-transport-https ca-certificates"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null'
-      - name: "Show GitHub package list"
-        shell: bash
-        run: "cat /etc/apt/sources.list.d/*"
-      - name: "Update APT again"
-        shell: bash
-        run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "apt install -y gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"
@@ -62,12 +44,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -100,13 +76,10 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
-        shell: bash
-        run: |
-          mkdir pkg_
-          mv *.deb *.xz pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "debian10.3"
-          path: "pkg_"
+          path: |
+            wezterm-*.deb
+            wezterm-*.xz

.github/workflows/gen_debian10.3_continuous.yml

@@ -46,36 +46,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           apt update
-      - name: "Install https support for apt"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt-get install -y apt-transport-https ca-certificates
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-      - name: "Add GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-      - name: "Show GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          cat /etc/apt/sources.list.d/*
-      - name: "Update APT again"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt update
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt install -y gh
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: |
@@ -90,16 +60,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_debian10.3_tag.yml

@@ -25,24 +25,6 @@ jobs:
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install https support for apt"
-        shell: bash
-        run: "apt-get install -y apt-transport-https ca-certificates"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null'
-      - name: "Show GitHub package list"
-        shell: bash
-        run: "cat /etc/apt/sources.list.d/*"
-      - name: "Update APT again"
-        shell: bash
-        run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "apt install -y gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"
@@ -53,12 +35,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -95,6 +71,17 @@ jobs:
           path: |
             wezterm-*.deb
             wezterm-*.xz
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "debian10.3"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gen_debian11.yml

@@ -34,24 +34,6 @@ jobs:
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install https support for apt"
-        shell: bash
-        run: "apt-get install -y apt-transport-https ca-certificates"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null'
-      - name: "Show GitHub package list"
-        shell: bash
-        run: "cat /etc/apt/sources.list.d/*"
-      - name: "Update APT again"
-        shell: bash
-        run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "apt install -y gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"
@@ -62,12 +44,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -100,13 +76,10 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
-        shell: bash
-        run: |
-          mkdir pkg_
-          mv *.deb *.xz pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "debian11"
-          path: "pkg_"
+          path: |
+            wezterm-*.deb
+            wezterm-*.xz

.github/workflows/gen_debian11_continuous.yml

@@ -46,36 +46,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           apt update
-      - name: "Install https support for apt"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt-get install -y apt-transport-https ca-certificates
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-      - name: "Add GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-      - name: "Show GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          cat /etc/apt/sources.list.d/*
-      - name: "Update APT again"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt update
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt install -y gh
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: |
@@ -90,16 +60,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_debian11_tag.yml

@@ -25,24 +25,6 @@ jobs:
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install https support for apt"
-        shell: bash
-        run: "apt-get install -y apt-transport-https ca-certificates"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null'
-      - name: "Show GitHub package list"
-        shell: bash
-        run: "cat /etc/apt/sources.list.d/*"
-      - name: "Update APT again"
-        shell: bash
-        run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "apt install -y gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"
@@ -53,12 +35,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -95,6 +71,17 @@ jobs:
           path: |
             wezterm-*.deb
             wezterm-*.xz
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "debian11"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gen_debian9.12.yml

@@ -48,24 +48,6 @@ jobs:
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install https support for apt"
-        shell: bash
-        run: "apt-get install -y apt-transport-https ca-certificates"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null'
-      - name: "Show GitHub package list"
-        shell: bash
-        run: "cat /etc/apt/sources.list.d/*"
-      - name: "Update APT again"
-        shell: bash
-        run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "apt install -y gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"
@@ -76,12 +58,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -114,13 +90,10 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
-        shell: bash
-        run: |
-          mkdir pkg_
-          mv *.deb *.xz pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "debian9.12"
-          path: "pkg_"
+          path: |
+            wezterm-*.deb
+            wezterm-*.xz

.github/workflows/gen_debian9.12_continuous.yml

@@ -59,36 +59,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           apt update
-      - name: "Install https support for apt"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt-get install -y apt-transport-https ca-certificates
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-      - name: "Add GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-      - name: "Show GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          cat /etc/apt/sources.list.d/*
-      - name: "Update APT again"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt update
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt install -y gh
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: |
@@ -103,16 +73,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_debian9.12_tag.yml

@@ -39,24 +39,6 @@ jobs:
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install https support for apt"
-        shell: bash
-        run: "apt-get install -y apt-transport-https ca-certificates"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null'
-      - name: "Show GitHub package list"
-        shell: bash
-        run: "cat /etc/apt/sources.list.d/*"
-      - name: "Update APT again"
-        shell: bash
-        run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "apt install -y gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"
@@ -67,12 +49,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -109,6 +85,17 @@ jobs:
           path: |
             wezterm-*.deb
             wezterm-*.xz
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "debian9.12"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gen_fedora33.yml

@@ -22,12 +22,6 @@ jobs:
       - name: "Install config manager"
         shell: bash
         run: "dnf install -y 'dnf-command(config-manager)'"
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "dnf install -y gh"
       - name: "Install git"
         shell: bash
         run: "yum install -y git"
@@ -44,12 +38,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -82,13 +70,11 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
+      - name: "Move RPM"
         shell: bash
-        run: |
+        run: "mv ~/rpmbuild/RPMS/*/*.rpm ."
-          mkdir pkg_
-          mv ~/rpmbuild/RPMS/*/*.rpm pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "fedora33"
-          path: "pkg_"
+          path: "wezterm-*.rpm"

.github/workflows/gen_fedora33_continuous.yml

@@ -26,16 +26,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           dnf install -y 'dnf-command(config-manager)'
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          dnf install -y gh
       - name: "Install git"
         shell: bash
         run: |
@@ -60,16 +50,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_fedora33_tag.yml

@@ -13,12 +13,6 @@ jobs:
       - name: "Install config manager"
         shell: bash
         run: "dnf install -y 'dnf-command(config-manager)'"
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "dnf install -y gh"
       - name: "Install git"
         shell: bash
         run: "yum install -y git"
@@ -35,12 +29,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -78,6 +66,17 @@ jobs:
         with:
           name: "fedora33"
           path: "wezterm-*.rpm"
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "fedora33"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gen_fedora34.yml

@@ -22,12 +22,6 @@ jobs:
       - name: "Install config manager"
         shell: bash
         run: "dnf install -y 'dnf-command(config-manager)'"
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "dnf install -y gh"
       - name: "Install git"
         shell: bash
         run: "yum install -y git"
@@ -44,12 +38,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -82,13 +70,11 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
+      - name: "Move RPM"
         shell: bash
-        run: |
+        run: "mv ~/rpmbuild/RPMS/*/*.rpm ."
-          mkdir pkg_
-          mv ~/rpmbuild/RPMS/*/*.rpm pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "fedora34"
-          path: "pkg_"
+          path: "wezterm-*.rpm"

.github/workflows/gen_fedora34_continuous.yml

@@ -26,16 +26,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           dnf install -y 'dnf-command(config-manager)'
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          dnf install -y gh
       - name: "Install git"
         shell: bash
         run: |
@@ -60,16 +50,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_fedora34_tag.yml

@@ -13,12 +13,6 @@ jobs:
       - name: "Install config manager"
         shell: bash
         run: "dnf install -y 'dnf-command(config-manager)'"
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "dnf install -y gh"
       - name: "Install git"
         shell: bash
         run: "yum install -y git"
@@ -35,12 +29,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -78,6 +66,17 @@ jobs:
         with:
           name: "fedora34"
           path: "wezterm-*.rpm"
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "fedora34"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gen_fedora35.yml

@@ -22,12 +22,6 @@ jobs:
       - name: "Install config manager"
         shell: bash
         run: "dnf install -y 'dnf-command(config-manager)'"
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "dnf install -y gh"
       - name: "Install git"
         shell: bash
         run: "yum install -y git"
@@ -44,12 +38,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -82,13 +70,11 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
+      - name: "Move RPM"
         shell: bash
-        run: |
+        run: "mv ~/rpmbuild/RPMS/*/*.rpm ."
-          mkdir pkg_
-          mv ~/rpmbuild/RPMS/*/*.rpm pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "fedora35"
-          path: "pkg_"
+          path: "wezterm-*.rpm"

.github/workflows/gen_fedora35_continuous.yml

@@ -26,16 +26,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           dnf install -y 'dnf-command(config-manager)'
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          dnf install -y gh
       - name: "Install git"
         shell: bash
         run: |
@@ -60,16 +50,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_fedora35_tag.yml

@@ -13,12 +13,6 @@ jobs:
       - name: "Install config manager"
         shell: bash
         run: "dnf install -y 'dnf-command(config-manager)'"
-      - name: "Enable GH CLI repo"
-        shell: bash
-        run: "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "dnf install -y gh"
       - name: "Install git"
         shell: bash
         run: "yum install -y git"
@@ -35,12 +29,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -78,6 +66,17 @@ jobs:
         with:
           name: "fedora35"
           path: "wezterm-*.rpm"
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "fedora35"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gen_macos.yml

@@ -23,16 +23,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -77,15 +67,8 @@ jobs:
         run: |
           export MACOSX_DEPLOYMENT_TARGET=10.9
           bash ci/deploy.sh
-      - name: "Move Package for artifact upload"
-        shell: bash
-        run: |
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          mkdir pkg_
-          mv *.zip pkg_
-
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "macos"
-          path: "pkg_"
+          path: "WezTerm-*.zip"

.github/workflows/gen_macos_continuous.yml

@@ -25,20 +25,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          git fetch --prune --unshallow
-
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_macos_tag.yml

@@ -14,16 +14,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -74,20 +64,6 @@ jobs:
         with:
           name: "macos"
           path: "WezTerm-*.zip"
-      - name: "Create pre-release"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          bash ci/retry.sh bash ci/create-release.sh ${{ github.event.release.tag_name }}
-      - name: "Upload to Tagged Release"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-          export MACOSX_DEPLOYMENT_TARGET=10.9
-          bash ci/retry.sh gh release upload --clobber ${ github.event.release.tag_name } WezTerm-*.zip
       - name: "Checkout homebrew tap"
         uses: actions/checkout@v2
         with:
@@ -104,3 +80,24 @@ jobs:
         with:
           commit_message: "Automated update to match latest tag"
           repository: "homebrew-wezterm"
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "macos"
+      - name: "Create pre-release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: "bash ci/retry.sh bash ci/create-release.sh ${{ github.event.release.tag_name }}"
+      - name: "Upload to Tagged Release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: "bash ci/retry.sh gh release upload --clobber ${ github.event.release.tag_name } WezTerm-*.zip"

.github/workflows/gen_ubuntu18.yml

@@ -29,12 +29,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -73,14 +67,13 @@ jobs:
       - name: "Build AppImage"
         shell: bash
         run: "bash ci/appimage.sh"
-      - name: "Move Package for artifact upload"
-        shell: bash
-        run: |
-          mkdir pkg_
-          mv *.deb *.xz pkg_
-          mv *.AppImage *.zsync pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "ubuntu18"
-          path: "pkg_"
+          path: |
+            wezterm-*.deb
+            wezterm-*.xz
+            *src.tar.gz
+            *.AppImage
+            *.zsync

.github/workflows/gen_ubuntu18_continuous.yml

@@ -35,16 +35,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_ubuntu18_tag.yml

@@ -20,12 +20,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -71,16 +65,6 @@ jobs:
             *src.tar.gz
             *.AppImage
             *.zsync
-      - name: "Create pre-release"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: "bash ci/retry.sh bash ci/create-release.sh ${{ github.event.release.tag_name }}"
-      - name: "Upload to Tagged Release"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: "bash ci/retry.sh gh release upload --clobber ${ github.event.release.tag_name } wezterm-*.deb wezterm-*.xz *src.tar.gz *.AppImage *.zsync"
       - name: "Checkout linuxbrew tap"
         uses: actions/checkout@v2
         with:
@@ -95,3 +79,24 @@ jobs:
         with:
           commit_message: "Automated update to match latest tag"
           repository: "linuxbrew-wezterm"
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "ubuntu18"
+      - name: "Create pre-release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: "bash ci/retry.sh bash ci/create-release.sh ${{ github.event.release.tag_name }}"
+      - name: "Upload to Tagged Release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: "bash ci/retry.sh gh release upload --clobber ${ github.event.release.tag_name } wezterm-*.deb wezterm-*.xz *src.tar.gz *.AppImage *.zsync"

.github/workflows/gen_ubuntu20.04.yml

@@ -34,24 +34,6 @@ jobs:
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install https support for apt"
-        shell: bash
-        run: "apt-get install -y apt-transport-https ca-certificates"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null'
-      - name: "Show GitHub package list"
-        shell: bash
-        run: "cat /etc/apt/sources.list.d/*"
-      - name: "Update APT again"
-        shell: bash
-        run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "apt install -y gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"
@@ -62,12 +44,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -100,13 +76,10 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
-        shell: bash
-        run: |
-          mkdir pkg_
-          mv *.deb *.xz pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "ubuntu20.04"
-          path: "pkg_"
+          path: |
+            wezterm-*.deb
+            wezterm-*.xz

.github/workflows/gen_ubuntu20.04_continuous.yml

@@ -46,36 +46,6 @@ jobs:
         run: |
           export BUILD_REASON=Schedule
           apt update
-      - name: "Install https support for apt"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt-get install -y apt-transport-https ca-certificates
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
-      - name: "Add GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null
-      - name: "Show GitHub package list"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          cat /etc/apt/sources.list.d/*
-      - name: "Update APT again"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt update
-      - name: "Install GH CLI"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          apt install -y gh
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: |
@@ -90,16 +60,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_ubuntu20.04_tag.yml

@@ -25,24 +25,6 @@ jobs:
       - name: "Update APT"
         shell: bash
         run: "apt update"
-      - name: "Install https support for apt"
-        shell: bash
-        run: "apt-get install -y apt-transport-https ca-certificates"
-      - name: "Install GitHub keyring"
-        shell: bash
-        run: "curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg"
-      - name: "Add GitHub package list"
-        shell: bash
-        run: 'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null'
-      - name: "Show GitHub package list"
-        shell: bash
-        run: "cat /etc/apt/sources.list.d/*"
-      - name: "Update APT again"
-        shell: bash
-        run: "apt update"
-      - name: "Install GH CLI"
-        shell: bash
-        run: "apt install -y gh"
       - name: "Ensure /run/sshd exists"
         shell: bash
         run: "mkdir -p /run/sshd"
@@ -53,12 +35,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -95,6 +71,17 @@ jobs:
           path: |
             wezterm-*.deb
             wezterm-*.xz
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "ubuntu20.04"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gen_windows.yml

@@ -23,12 +23,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -62,13 +56,10 @@ jobs:
       - name: "Package"
         shell: bash
         run: "bash ci/deploy.sh"
-      - name: "Move Package for artifact upload"
-        shell: bash
-        run: |
-          mkdir pkg_
-          mv *.zip *.exe pkg_
       - name: "Upload artifact"
         uses: actions/upload-artifact@v2
         with:
           name: "windows"
-          path: "pkg_"
+          path: |
+            WezTerm-*.zip
+            WezTerm-*.exe

.github/workflows/gen_windows_continuous.yml

@@ -25,16 +25,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: |
-          export BUILD_REASON=Schedule
-          git fetch --prune --unshallow
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/gen_windows_tag.yml

@@ -14,12 +14,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: "recursive"
-      - name: "Fetch tags"
-        shell: bash
-        run: "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-      - name: "Fetch tag/branch history"
-        shell: bash
-        run: "git fetch --prune --unshallow"
       - name: "Install Rust"
         uses: actions-rs/toolchain@v1
         with:
@@ -57,6 +51,17 @@ jobs:
           path: |
             WezTerm-*.zip
             WezTerm-*.exe
+
+  upload:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: "checkout repo"
+        uses: actions/checkout@v2
+      - name: "Download artifact"
+        uses: actions/download-artifact@v2
+        with:
+          name: "windows"
       - name: "Create pre-release"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

ci/generate-workflows.py

@@ -348,24 +348,25 @@ cargo build --all --release""",
         return steps
 
     def upload_artifact(self):
-        run = "mkdir pkg_\n"
+        steps = []
-        if self.uses_yum():
-            run += "mv ~/rpmbuild/RPMS/*/*.rpm pkg_\n"
-        if "win" in self.name:
-            run += "mv *.zip *.exe pkg_\n"
-        if "mac" in self.name:
-            run += "mv *.zip pkg_\n"
-        if ("ubuntu" in self.name) or ("debian" in self.name):
-            run += "mv *.deb *.xz pkg_\n"
-        if self.app_image:
-            run += "mv *.AppImage *.zsync pkg_\n"
 
-        return [
+        if self.uses_yum():
-            RunStep("Move Package for artifact upload", run),
+            steps.append(
+                RunStep(
+                    "Move RPM",
+                    f"mv ~/rpmbuild/RPMS/*/*.rpm .",
+                )
+            )
+
+        patterns = self.asset_patterns()
+        glob = " ".join(patterns)
+        paths = "\n".join(patterns)
+
+        return steps + [
             ActionStep(
                 "Upload artifact",
                 action="actions/upload-artifact@v2",
-                params={"name": self.name, "path": "pkg_"},
+                params={"name": self.name, "path": paths},
             ),
         ]
 
@@ -431,18 +432,14 @@ cargo build --all --release""",
     def upload_asset_tag(self):
         steps = []
 
-        if self.uses_yum():
-            steps.append(RunStep("Move RPM", "mv ~/rpmbuild/RPMS/*/*.rpm ."))
-
         patterns = self.asset_patterns()
         glob = " ".join(patterns)
-        paths = "\n".join(patterns)
 
         return steps + [
             ActionStep(
-                "Upload artifact",
+                "Download artifact",
-                action="actions/upload-artifact@v2",
+                action="actions/download-artifact@v2",
-                params={"name": self.name, "path": paths},
+                params={"name": self.name},
             ),
             RunStep(
                 "Create pre-release",
@@ -545,17 +542,6 @@ cargo build --all --release""",
                         "dnf config-manager --set-enabled powertools",
                     ),
                 ]
-            if ("fedora" in self.container) or ("centos" in self.container):
-                steps += [
-                    RunStep(
-                        "Enable GH CLI repo",
-                        "dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo",
-                    ),
-                    RunStep(
-                        "Install GH CLI",
-                        "dnf install -y gh",
-                    ),
-                ]
         steps += self.install_newer_compiler()
         steps += self.install_git()
         steps += self.install_curl()
@@ -564,34 +550,11 @@ cargo build --all --release""",
             if self.container:
                 steps += [
                     RunStep("Update APT", f"{sudo}apt update"),
-                    RunStep(
-                        "Install https support for apt",
-                        f"{sudo}apt-get install -y apt-transport-https ca-certificates",
-                    ),
-                    RunStep(
-                        "Install GitHub keyring",
-                        f"curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | {sudo}dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg",
-                    ),
-                    RunStep(
-                        "Add GitHub package list",
-                        f'echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | {sudo}tee /etc/apt/sources.list.d/github-cli.list > /dev/null',
-                    ),
-                    RunStep(
-                        "Show GitHub package list",
-                        "cat /etc/apt/sources.list.d/*",
-                    ),
-                    RunStep("Update APT again", f"{sudo}apt update"),
-                    RunStep("Install GH CLI", f"{sudo}apt install -y gh"),
                 ]
 
         steps += self.install_openssh_server()
         steps += [
             CheckoutStep(),
-            # We need tags in order to use git describe for build/packaging
-            RunStep(
-                "Fetch tags", "git fetch --depth=1 origin +refs/tags/*:refs/tags/*"
-            ),
-            RunStep("Fetch tag/branch history", "git fetch --prune --unshallow"),
         ]
         steps += self.install_rust(cache="mac" not in self.name)
         steps += self.install_system_deps()
@@ -644,9 +607,14 @@ cargo build --all --release""",
         steps += self.build_all_release()
         steps += self.test_all_release()
         steps += self.package(trusted=True)
-        steps += self.upload_asset_tag()
+        steps += self.upload_artifact()
         steps += self.update_homebrew_tap()
 
+        uploader = Job(
+            runs_on="ubuntu-latest",
+            steps=[CheckoutStep(submodules=False)] + self.upload_asset_tag(),
+        )
+
         env = self.global_env()
         return (
             Job(
@@ -655,7 +623,7 @@ cargo build --all --release""",
                 steps=steps,
                 env=env,
             ),
-            None,
+            uploader,
         )
 
 
@@ -705,6 +673,10 @@ jobs:
 
             job.render(f, 3)
 
+            # We upload using a native runner as github API access
+            # inside a container is really unreliable and can result
+            # in broken releases that can't automatically be repaired
+            # <https://github.com/cli/cli/issues/4863>
             if uploader:
                 f.write(
                     """