diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e974371..ed8d9044 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: jobs: linux-build-libs-1: runs-on: ubuntu-latest - container: swift:5.8-focal + container: swift:5.9-focal steps: - name: checkout uses: actions/checkout@v3 @@ -19,7 +19,7 @@ jobs: linux-build-libs-2: runs-on: ubuntu-latest - container: swift:5.8-focal + container: swift:5.9-focal steps: - name: checkout uses: actions/checkout@v3 @@ -44,7 +44,7 @@ jobs: linux-lib-test-libs-1: runs-on: ubuntu-latest - container: swift:5.8-focal + container: swift:5.9-focal steps: - name: checkout uses: actions/checkout@v3 @@ -55,7 +55,7 @@ jobs: linux-lib-test-libs-2: runs-on: ubuntu-latest - container: swift:5.8-focal + container: swift:5.9-focal steps: - name: checkout uses: actions/checkout@v3 @@ -74,7 +74,7 @@ jobs: linux-api-build: runs-on: ubuntu-latest - container: swift:5.8-focal + container: swift:5.9-focal steps: - name: checkout uses: actions/checkout@v3 @@ -88,7 +88,7 @@ jobs: linux-api-test: runs-on: ubuntu-latest - container: swift:5.8-focal + container: swift:5.9-focal env: DATABASE_HOST: postgres services: @@ -134,7 +134,7 @@ jobs: - name: setup xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: 14.3.1 + xcode-version: 15.0.1 - uses: actions/cache@v3 with: path: macapp/App/.build diff --git a/api/Sources/Api/Database/Migrations/016_ReworkPayments.swift b/api/Sources/Api/Database/Migrations/016_ReworkPayments.swift index d69f351a..2f1d85ad 100644 --- a/api/Sources/Api/Database/Migrations/016_ReworkPayments.swift +++ b/api/Sources/Api/Database/Migrations/016_ReworkPayments.swift @@ -1,4 +1,5 @@ import FluentSQL +import Foundation import Gertie struct ReworkPayments: GertieMigration { diff --git a/macapp/App/Sources/App/App.swift b/macapp/App/Sources/App/App.swift index ae8fede5..efa02796 100644 --- a/macapp/App/Sources/App/App.swift +++ b/macapp/App/Sources/App/App.swift @@ -5,6 +5,8 @@ import MacAppRoute typealias UserData = GetUserData.Output +// make a change to run ci! + @MainActor public struct App { var menuBarManager: MenuBarManager var blockedRequestsWindow: BlockedRequestsWindow