Skip to content

Commit

Permalink
Merge branch 'circleci'
Browse files Browse the repository at this point in the history
  • Loading branch information
thinca committed Apr 6, 2024
2 parents 5c8df1b + 2ffeb11 commit a90cead
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 6 deletions.
16 changes: 14 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parameters:
default: v1.7.0

orbs:
win: circleci/windows@1.0.0
win: circleci/windows@5.0.0

jobs:
linux-test:
Expand Down Expand Up @@ -36,7 +36,7 @@ jobs:
type: string
default: latest
executor:
name: win/vs2019
name: win/default
shell: bash.exe
steps:
- run:
Expand Down Expand Up @@ -112,6 +112,12 @@ workflows:
- linux-test:
name: 'Linux: Vim v8.2.0000'
version: 'v8.2.0000'
- linux-test:
name: 'Linux: Vim v9.0.0000'
version: 'v9.0.0000'
- linux-test:
name: 'Linux: Vim v9.1.0000'
version: 'v9.1.0000'
- linux-test:
name: 'Linux: Vim latest'
- windows-test:
Expand All @@ -126,5 +132,11 @@ workflows:
- windows-test:
name: 'Windows: Vim v8.2.0008'
version: 'v8.2.0008'
- windows-test:
name: 'Windows: Vim v9.0.0000'
version: 'v9.0.0000'
- windows-test:
name: 'Windows: Vim v9.1.0'
version: 'v9.1.0'
- windows-test:
name: 'Windows: Vim latest'
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ CI Service | Status
[AppVeyor-badge]: https://ci.appveyor.com/api/projects/status/hr4us4ogbir0177i/branch/master?svg=true "Build status"
[AppVeyor-result]: https://ci.appveyor.com/project/thinca/vim-themis/branch/master
[CircleCI-home]: https://circleci.com/
[CircleCI-badge]: https://circleci.com/gh/thinca/vim-themis/tree/master.svg?style=svg "CircleCI"
[CircleCI-result]: https://circleci.com/gh/thinca/vim-themis/tree/master
[CircleCI-badge]: https://dl.circleci.com/status-badge/img/circleci/3775y8m7ayd3ZUJkcLeC1F/JGVoXQ8uTvM9JEDkvrqcBt/tree/master.svg?style=svg
[CircleCI-result]: https://dl.circleci.com/status-badge/redirect/circleci/3775y8m7ayd3ZUJkcLeC1F/JGVoXQ8uTvM9JEDkvrqcBt/tree/master
[gh-action-home]: https://github.com/features/actions
[gh-action-badge]: ./../../actions/workflows/test.yml/badge.svg?branch=master "Test"
[gh-action-result]: ./../../actions/workflows/test.yml?query=branch%3Amaster
Expand Down
16 changes: 14 additions & 2 deletions examples/ci/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parameters:
default: v1.7.0

orbs:
win: circleci/windows@1.0.0
win: circleci/windows@5.0.0

jobs:
linux-test:
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:
type: string
default: latest
executor:
name: win/vs2019
name: win/default
shell: bash.exe
steps:
- run:
Expand Down Expand Up @@ -119,6 +119,12 @@ workflows:
- linux-test:
name: 'Linux: Vim v8.2.0000'
version: 'v8.2.0000'
- linux-test:
name: 'Linux: Vim v9.0.0000'
version: 'v9.0.0000'
- linux-test:
name: 'Linux: Vim v9.1.0000'
version: 'v9.1.0000'
- linux-test:
name: 'Linux: Vim latest'
- windows-test:
Expand All @@ -133,5 +139,11 @@ workflows:
- windows-test:
name: 'Windows: Vim v8.2.0008'
version: 'v8.2.0008'
- windows-test:
name: 'Windows: Vim v9.0.0000'
version: 'v9.0.0000'
- windows-test:
name: 'Windows: Vim v9.1.0'
version: 'v9.1.0'
- windows-test:
name: 'Windows: Vim latest'

0 comments on commit a90cead

Please sign in to comment.