diff --git a/.github/workflows/gen_ubuntu19.10.yml b/.github/workflows/gen_ubuntu19.10.yml deleted file mode 100644 index d1df36e59..000000000 --- a/.github/workflows/gen_ubuntu19.10.yml +++ /dev/null @@ -1,83 +0,0 @@ - -name: ubuntu19.10 - -on: - push: - branches: - - master - pull_request: - branches: - - master - - -jobs: - build: - strategy: - fail-fast: false - runs-on: "ubuntu-latest" - container: "ubuntu:19.10" - steps: - - name: "set APT to non-interactive" - shell: bash - run: "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections" - - name: "Install git" - shell: bash - run: "apt-get install -y git" - - name: "Install curl" - shell: bash - run: "apt-get install -y curl" - - name: "checkout repo" - 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: - profile: "minimal" - toolchain: "stable" - override: true - components: "rustfmt" - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" - - name: "Cache cargo" - uses: actions/cache@v2 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - - key: "ubuntu19.10-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo" - - name: "Install System Deps" - shell: bash - run: "./get-deps" - - name: "Check formatting" - shell: bash - run: "cargo fmt --all -- --check" - - name: "Build (Release mode)" - shell: bash - run: "cargo build --all --release" - - name: "Test (Release mode)" - shell: bash - run: "cargo test --all --release" - - 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@master - with: - name: "ubuntu19.10" - path: "pkg_" diff --git a/.github/workflows/gen_ubuntu19.10_continuous.yml b/.github/workflows/gen_ubuntu19.10_continuous.yml deleted file mode 100644 index c26399eee..000000000 --- a/.github/workflows/gen_ubuntu19.10_continuous.yml +++ /dev/null @@ -1,106 +0,0 @@ - -name: ubuntu19.10_continuous - -on: - schedule: - - cron: "10 * * * *" - - -jobs: - build: - strategy: - fail-fast: false - runs-on: "ubuntu-latest" - container: "ubuntu:19.10" - steps: - - name: "set APT to non-interactive" - shell: bash - run: | - export BUILD_REASON=Schedule - echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections - - - - name: "Install git" - shell: bash - run: | - export BUILD_REASON=Schedule - apt-get install -y git - - - - name: "Install curl" - shell: bash - run: | - export BUILD_REASON=Schedule - apt-get install -y curl - - - - name: "checkout repo" - 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: - profile: "minimal" - toolchain: "stable" - override: true - components: "rustfmt" - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" - - name: "Cache cargo" - uses: actions/cache@v2 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - - key: "ubuntu19.10-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo" - - name: "Install System Deps" - shell: bash - run: | - export BUILD_REASON=Schedule - ./get-deps - - - - name: "Build (Release mode)" - shell: bash - run: | - export BUILD_REASON=Schedule - cargo build --all --release - - - - name: "Test (Release mode)" - shell: bash - run: | - export BUILD_REASON=Schedule - cargo test --all --release - - - - name: "Package" - shell: bash - run: | - export BUILD_REASON=Schedule - bash ci/deploy.sh - - - - name: "Upload to Nightly Release" - uses: wez/upload-release-assets@releases/v1 - with: - files: "wezterm-*.deb;wezterm-*.xz;wezterm-*.tar.gz" - release-tag: "nightly" - repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/gen_ubuntu19.10_tag.yml b/.github/workflows/gen_ubuntu19.10_tag.yml deleted file mode 100644 index c475ec229..000000000 --- a/.github/workflows/gen_ubuntu19.10_tag.yml +++ /dev/null @@ -1,76 +0,0 @@ - -name: ubuntu19.10_tag - -on: - push: - tags: - - "20*" - - -jobs: - build: - strategy: - fail-fast: false - runs-on: "ubuntu-latest" - container: "ubuntu:19.10" - steps: - - name: "set APT to non-interactive" - shell: bash - run: "echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections" - - name: "Install git" - shell: bash - run: "apt-get install -y git" - - name: "Install curl" - shell: bash - run: "apt-get install -y curl" - - name: "checkout repo" - 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: - profile: "minimal" - toolchain: "stable" - override: true - components: "rustfmt" - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: "true" - - name: "Cache cargo" - uses: actions/cache@v2 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - - key: "ubuntu19.10-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo" - - name: "Install System Deps" - shell: bash - run: "./get-deps" - - name: "Build (Release mode)" - shell: bash - run: "cargo build --all --release" - - name: "Test (Release mode)" - shell: bash - run: "cargo test --all --release" - - name: "Package" - shell: bash - run: "bash ci/deploy.sh" - - name: "Upload to Tagged Release" - uses: softprops/action-gh-release@v1 - with: - files: | - wezterm-*.deb - wezterm-*.xz - wezterm-*.tar.gz - - prerelease: true - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py index 42fca6635..dc0a1bf45 100755 --- a/ci/generate-workflows.py +++ b/ci/generate-workflows.py @@ -102,7 +102,6 @@ class Target(object): rust_target=None, continuous_only=False, app_image=False, - skip_apt_update=False, ): if not name: if container: @@ -116,7 +115,6 @@ class Target(object): self.rust_target = rust_target self.continuous_only = continuous_only self.app_image = app_image - self.skip_apt_update = skip_apt_update def uses_yum(self): if "fedora" in self.name: @@ -432,10 +430,9 @@ cargo build --all --release""", ), ] sudo = "sudo -n " if self.needs_sudo() else "" - if not self.skip_apt_update: - steps += [ - RunStep("Update APT", f"{sudo}apt update"), - ] + steps += [ + RunStep("Update APT", f"{sudo}apt update"), + ] if self.container: if self.container == "centos:8": steps += [ @@ -514,8 +511,6 @@ cargo build --all --release""", TARGETS = [ Target(name="ubuntu:16", os="ubuntu-16.04", app_image=True), Target(name="ubuntu:18", os="ubuntu-18.04", continuous_only=True), - Target(container="ubuntu:19.10", continuous_only=True, skip_apt_update=True), - # The container gets stuck while running get-deps, so disable for now Target(container="ubuntu:20.04", continuous_only=True), # debian 8's wayland libraries are too old for wayland-client # Target(container="debian:8.11", continuous_only=True, bootstrap_git=True), diff --git a/ci/subst-release-info.py b/ci/subst-release-info.py index a9dba1881..ce1e34f58 100755 --- a/ci/subst-release-info.py +++ b/ci/subst-release-info.py @@ -21,7 +21,6 @@ CATEGORIZE = { r"Ubuntu16.04.deb$": "ubuntu16_deb", r"^wezterm-\d+-\d+-[a-f0-9]+.deb$": "ubuntu16_deb", r"Ubuntu18.04.deb$": "ubuntu18_deb", - r"Ubuntu19.10.deb$": "ubuntu19_deb", r"Ubuntu20.04.deb$": "ubuntu20_deb", r"Ubuntu16.04.tar.xz$": "linux_raw_bin", r"^wezterm-\d+-\d+-[a-f0-9]+.tar.xz$": "linux_raw_bin", diff --git a/docs/install/linux.markdown b/docs/install/linux.markdown index f5ced9f8f..7e0f63cb2 100644 --- a/docs/install/linux.markdown +++ b/docs/install/linux.markdown @@ -44,7 +44,6 @@ you can try the AppImage download which should work on most Linux systems. |------------|------------------|---------------------| |Ubuntu16 |[{{ ubuntu16_deb_stable_asset }}]({{ ubuntu16_deb_stable }}) |[{{ ubuntu16_deb_nightly_asset }}]({{ ubuntu16_deb_nightly }})| |Ubuntu18 |[{{ ubuntu18_deb_stable_asset }}]({{ ubuntu18_deb_stable }}) |[{{ ubuntu18_deb_nightly_asset }}]({{ ubuntu18_deb_nightly }})| -|Ubuntu19 |[{{ ubuntu19_deb_stable_asset }}]({{ ubuntu19_deb_stable }}) |[{{ ubuntu19_deb_nightly_asset }}]({{ ubuntu19_deb_nightly }})| |Ubuntu20 |[{{ ubuntu20_deb_stable_asset }}]({{ ubuntu20_deb_stable }}) |[{{ ubuntu20_deb_nightly_asset }}]({{ ubuntu20_deb_nightly }})| |Debian9 |[{{ debian9_deb_stable_asset }}]({{ debian9_deb_stable }}) |[{{ debian9_deb_nightly_asset }}]({{ debian9_deb_nightly }})| |Debian10 |[{{ debian10_deb_stable_asset }}]({{ debian10_deb_stable }}) |[{{ debian10_deb_nightly_asset }}]({{ debian10_deb_nightly }})|