Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: CI was broken due to macos-latest breaking change #82

Merged
merged 1 commit into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as yaml from "https://deno.land/std@0.170.0/encoding/yaml.ts";
import $ from "https://deno.land/x/dax@0.35.0/mod.ts";

enum Runner {
MacLatest = "macOS-latest",
Mac14 = "macos-14",
Mac13 = "macos-13",
MacLatest = "macos-latest",
Windows = "windows-latest",
// uses an older version of ubuntu because of issue dprint/#483
Linux = "ubuntu-20.04",
Expand All @@ -17,11 +17,11 @@ interface ProfileData {
}

const profileDataItems: ProfileData[] = [{
runner: Runner.MacLatest,
runner: Runner.Mac13,
target: "x86_64-apple-darwin",
runTests: true,
}, {
runner: Runner.Mac14,
runner: Runner.MacLatest,
target: "aarch64-apple-darwin",
runTests: true,
}, {
Expand Down Expand Up @@ -85,7 +85,7 @@ const ci = {
RUST_BACKTRACE: "full",
},
steps: [
{ uses: "actions/checkout@v2" },
{ uses: "actions/checkout@v4" },
{ uses: "dsherret/rust-toolchain-file@v1" },
{
name: "Cache cargo",
Expand All @@ -102,7 +102,7 @@ const ci = {
},
{ uses: "denoland/setup-deno@v1" },
{
uses: "actions/setup-node@v3",
uses: "actions/setup-node@v4",
with: {
"node-version": 18,
},
Expand Down Expand Up @@ -162,8 +162,8 @@ const ci = {
...profiles.map((profile) => {
function getRunSteps() {
switch (profile.runner) {
case Runner.Mac13:
case Runner.MacLatest:
case Runner.Mac14:
return [
`cd target/${profile.target}/release`,
`zip -r ${profile.zipFileName} dprint-plugin-prettier`,
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
strategy:
matrix:
config:
- os: macOS-latest
- os: macos-13
run_tests: "true"
cross: "false"
target: x86_64-apple-darwin
- os: macos-14
- os: macos-latest
run_tests: "true"
cross: "false"
target: aarch64-apple-darwin
Expand All @@ -50,7 +50,7 @@ jobs:
CARGO_INCREMENTAL: 0
RUST_BACKTRACE: full
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: dsherret/rust-toolchain-file@v1
- name: Cache cargo
uses: Swatinem/rust-cache@v2
Expand All @@ -61,7 +61,7 @@ jobs:
if: matrix.config.target == 'aarch64-apple-darwin'
run: rustup target add aarch64-apple-darwin
- uses: denoland/setup-deno@v1
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
- name: npm install
Expand Down