Skip to content

Commit

Permalink
Merge pull request #1285 from axodotdev/bump-macos
Browse files Browse the repository at this point in the history
chore: bump min macos version to 13
  • Loading branch information
Gankra authored Aug 8, 2024
2 parents 011d5b0 + 9d61f95 commit 39abb63
Show file tree
Hide file tree
Showing 52 changed files with 104 additions and 104 deletions.
4 changes: 2 additions & 2 deletions cargo-dist/src/backend/ci/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,9 @@ type GithubRunner = String;
/// The Github Runner to use for Linux
const GITHUB_LINUX_RUNNER: &str = "ubuntu-20.04";
/// The Github Runner to use for Intel macos
const GITHUB_MACOS_INTEL_RUNNER: &str = "macos-12";
const GITHUB_MACOS_INTEL_RUNNER: &str = "macos-13";
/// The Github Runner to use for Apple Silicon macos
const GITHUB_MACOS_ARM64_RUNNER: &str = "macos-12";
const GITHUB_MACOS_ARM64_RUNNER: &str = "macos-13";
/// The Github Runner to use for windows
const GITHUB_WINDOWS_RUNNER: &str = "windows-2019";

Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/akaikatana_basic.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1846,7 +1846,7 @@ try {
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1855,7 +1855,7 @@ try {
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/akaikatana_musl.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1353,7 +1353,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ try {
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1869,7 +1869,7 @@ try {
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1874,7 +1874,7 @@ try {
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1883,7 +1883,7 @@ try {
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/akaikatana_updaters.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1886,7 +1886,7 @@ try {
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1895,7 +1895,7 @@ try {
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_abyss.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3406,7 +3406,7 @@ run("axolotlsay");
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -3415,7 +3415,7 @@ run("axolotlsay");
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3400,7 +3400,7 @@ run("axolotlsay");
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -3409,7 +3409,7 @@ run("axolotlsay");
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_alias.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3414,7 +3414,7 @@ run("axolotlsay");
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -3423,7 +3423,7 @@ run("axolotlsay");
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3412,7 +3412,7 @@ run("axolotlsay");
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -3421,7 +3421,7 @@ run("axolotlsay");
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_basic.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3398,7 +3398,7 @@ run("axolotlsay");
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -3407,7 +3407,7 @@ run("axolotlsay");
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3488,7 +3488,7 @@ run("axolotlsay");
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -3497,7 +3497,7 @@ run("axolotlsay");
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3398,7 +3398,7 @@ run("axolotlsay");
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -3407,7 +3407,7 @@ run("axolotlsay");
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1323,7 +1323,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1323,7 +1323,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1323,7 +1323,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -1323,7 +1323,7 @@ download_binary_and_run_installer "$@" || exit 1
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ end
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -318,7 +318,7 @@ end
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3387,7 +3387,7 @@ run("axolotlsay");
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -3396,7 +3396,7 @@ run("axolotlsay");
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_dispatch.snap
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ expression: self.payload
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -245,7 +245,7 @@ expression: self.payload
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
4 changes: 2 additions & 2 deletions cargo-dist/tests/snapshots/axolotlsay_dispatch_abyss.snap
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ expression: self.payload
"targets": [
"aarch64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=aarch64-apple-darwin",
"cache_provider": "github"
Expand All @@ -253,7 +253,7 @@ expression: self.payload
"targets": [
"x86_64-apple-darwin"
],
"runner": "macos-12",
"runner": "macos-13",
"install_dist": "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/vSOME_VERSION/cargo-dist-installer.sh | sh",
"dist_args": "--artifacts=local --target=x86_64-apple-darwin",
"cache_provider": "github"
Expand Down
Loading

0 comments on commit 39abb63

Please sign in to comment.