Skip to content

Commit

Permalink
Update macos version in CI to use faster runner (#491)
Browse files Browse the repository at this point in the history
* Update macos version in CI to use faster runner

* Drop actionlint with the wrong detection

actionlint made some wrong detection with the version gaps

popular-action-inputs-validation-at-with
macos runner

https://github.com/actions/languageservices is enough
  • Loading branch information
kachick authored Feb 13, 2024
1 parent 93669eb commit 7b89367
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
matrix:
os:
- ubuntu-latest
- macos-13
- macos-14
runs-on: ${{ matrix.os }}
timeout-minutes: 30
steps:
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,10 @@ jobs:
fail-fast: false
# Syntax https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
matrix:
# macos is covered in nix ci
os: ['ubuntu-latest']
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for 'n.0'
ruby: ['head', '3.3', '3.2']
# # Disabled macos runner. This gem should work because of it is written in pure ruby :). And the runner is too slow and often be stacked.
# include:
# - os: 'macos-latest'
# ruby: '3.3'
# # Windows CI takes longtime. It has been succeeded in #223, it is enough for now.
# - os: 'windows-latest'
# ruby: '3.3'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 0 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,11 @@ task :deps do
sh('dprint --version')
sh('tree --version')
sh('typos --version')
sh('actionlint --version')
end

desc 'Tests except ruby'
task :check_non_ruby do
Rake::Task['dprint'].invoke
sh('typos . .github .vscode')
sh('actionlint')
sh('nixpkgs-fmt --check ./*.nix')
end
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
nil
nixpkgs-fmt
typos
actionlint
];
};

Expand Down

0 comments on commit 7b89367

Please sign in to comment.