Skip to content

Commit

Permalink
Merge branch 'trs/ci/stop-using-ubuntu-18.04'
Browse files Browse the repository at this point in the history
  • Loading branch information
tsibley committed Mar 8, 2023
2 parents bb7c149 + 37c768d commit f315820
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ jobs:
# considerations affecting the choice of build machine OS¹ and future
# plans for robust, turnkey build environments².
#
# On Linux, we build inside a container to avoid portability issues, so
# the container's host OS version here doesn't have an impact (other
# than CI stability).
#
# ¹ https://pyoxidizer.readthedocs.io/en/stable/pyoxidizer_distributing_binary_portability.html
# ² https://pyoxidizer.readthedocs.io/en/stable/pyoxidizer_status.html#an-official-build-environment
#
Expand All @@ -107,7 +111,7 @@ jobs:
# Mac Mini for ~$700 which would pay for itself in less than 2 months.
# -trs, 31 May 2022
include:
- os: ubuntu-18.04
- os: ubuntu-22.04
target: x86_64-unknown-linux-gnu
exe: nextstrain

Expand Down Expand Up @@ -257,7 +261,6 @@ jobs:
#
# XXX TODO: macOS aarch64 (M1, Apple Silicon, arm64); see above.
include:
- { os: ubuntu-18.04, target: x86_64-unknown-linux-gnu }
- { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu }
- { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu }
- { os: macos-11, target: x86_64-apple-darwin }
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/standalone-installers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-18.04
- ubuntu-20.04
- ubuntu-22.04
- macos-11
Expand Down

0 comments on commit f315820

Please sign in to comment.