Skip to content

Commit

Permalink
Merge pull request #136 from tuist/fix-ci
Browse files Browse the repository at this point in the history
Fix continuous integration
  • Loading branch information
pepicrft authored Dec 24, 2024
2 parents c679235 + 71847c8 commit b35d8a0
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 14 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/virtualos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ concurrency:
group: virtualos-${{ github.head_ref }}
cancel-in-progress: true

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
name: "Build"
runs-on: "macos-13"
runs-on: "macos-135
steps:
- uses: actions/checkout@v4
- uses: jdx/mise-action@v2
Expand All @@ -28,7 +31,7 @@ jobs:
bundle:
name: "Bundle"
runs-on: "macos-13"
runs-on: "macos-135
steps:
- uses: actions/checkout@v4
- uses: jdx/mise-action@v2
Expand All @@ -46,7 +49,7 @@ jobs:
test:
name: "Test"
runs-on: "macos-13"
runs-on: "macos-135
steps:
- uses: actions/checkout@v4
- uses: jdx/mise-action@v2
Expand All @@ -61,7 +64,7 @@ jobs:
lint:
name: Lint
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- uses: jdx/mise-action@v2
Expand All @@ -72,7 +75,7 @@ jobs:
cache:
name: Cache
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- uses: jdx/mise-action@v2
Expand Down
17 changes: 13 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Kolos65/Mockable",
"state" : {
"revision" : "da977ecb20974c4b1cf185f5fd38771b2d4674fb",
"version" : "0.0.10"
"revision" : "e1b311b01c11415099341eee49769185e965ac4c",
"version" : "0.2.0"
}
},
{
Expand All @@ -32,8 +32,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax.git",
"state" : {
"revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
"version" : "509.1.1"
"revision" : "0687f71944021d616d34d922343dcef086855920",
"version" : "600.0.1"
}
},
{
"identity" : "xctest-dynamic-overlay",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "a3f634d1a409c7979cabc0a71b3f26ffa9fc8af1",
"version" : "1.4.3"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// swift-tools-version: 5.8.1
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
@preconcurrency import PackageDescription

#if TUIST
import ProjectDescription
Expand Down
3 changes: 3 additions & 0 deletions Tuist.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import ProjectDescription

let tuist = Tuist(fullHandle: "tuist/virtualos")
3 changes: 0 additions & 3 deletions Tuist/Config.swift

This file was deleted.

2 changes: 1 addition & 1 deletion Tuist/ProjectDescriptionHelpers/Module.swift
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public enum Module: CaseIterable {
bundleId: bundleId,
deploymentTargets: .macOS("13.0.0"),
sources: testSources(targetName: targetName),
dependencies: dependencies + [.xctest, .target(name: targetName), .external(name: "MockableTest")]
dependencies: dependencies + [.xctest, .target(name: targetName)]
))
}
return targets
Expand Down

0 comments on commit b35d8a0

Please sign in to comment.