Skip to content

Commit

Permalink
[com.circleci] Add missing resource classes, fix job constraint (#58)
Browse files Browse the repository at this point in the history
  • Loading branch information
bioball authored May 14, 2024
1 parent 06d629e commit 18cee9d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion packages/com.circleci.v2/Config.pkl
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class Job {
resource_class: ResourceClass?

/// Options for [docker executor](https://circleci.com/docs/configuration-reference/#docker)
docker: Listing<DockerImage>(!isEmpty)?(onlyOneSet(List(this, macos, machine)))
docker: Listing<DockerImage>(!isEmpty)?(onlyOneSet(List(this, executor, macos, machine)))

/// CircleCI supports running jobs on macOS, to allow you to build, test, and deploy apps for
/// macOS, iOS, tvOS and watchOS.
Expand All @@ -199,6 +199,18 @@ typealias ResourceClass =
|"arm.2xlarge"
|"macos.m1.medium.gen1"
|"macos.m1.large.gen1"
|"windows.medium"
|"windows.large"
|"windows.xlarge"
|"windows.2xlarge"
|"gpu.nvidia.small"
|"gpu.nvidia.small.gen2"
|"gpu.nvidia.small.multi"
|"gpu.nvidia.medium.multi"
|"gpu.nvidia.medium"
|"gpu.nvidia.large"
|"windows.gpu.nvidia.medium"


class MacOSExecutor {
/// The version of Xcode that is installed on the virtual machine, see the
Expand Down
2 changes: 1 addition & 1 deletion packages/com.circleci.v2/PklProject
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
amends "../basePklProject.pkl"

package {
version = "1.1.1"
version = "1.1.2"
}

0 comments on commit 18cee9d

Please sign in to comment.