Skip to content

use newer swift in docker image and CI #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push]
jobs:
codecov:
container:
image: swift:5.9
image: swift:6.0
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ jobs:
image:
- swift:5.9-focal
- swift:5.9-jammy
- swift:5.9-amazonlinux2
- swift:5.10-focal
- swift:5.10-jammy
- swift:6.0-focal
- swift:6.0-jammy
container: ${{ matrix.image }}
steps:
- name: Checkout code
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM swift:5.9 as builder
FROM swift:6.0 AS builder

# Install OS updates and, if needed, sqlite3
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
Expand Down Expand Up @@ -52,7 +52,7 @@ RUN bin_path="$(swift build --package-path /build -c release --show-bin-path)" \
## Production image
#

FROM swift:5.9
FROM swift:6.0

# DEBIAN_FRONTEND=noninteractive for automatic UTC configuration in tzdata
# Make sure all system packages are up to date.
Expand Down
13 changes: 2 additions & 11 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let package = Package(
.package(url: "https://github.com/mattpolzin/VaporTypedRoutes.git", .upToNextMinor(from: "0.10.0")),
.package(url: "https://github.com/mattpolzin/VaporOpenAPI.git", .upToNextMinor(from: "0.6.0")),

.package(url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMinor(from: "0.9.17")),
// .package(url: "https://github.com/weichsel/ZIPFoundation.git", .upToNextMinor(from: "0.9.17")),

.package(url: "https://github.com/mattpolzin/JSONAPI-OpenAPI.git", .upToNextMinor(from: "0.31.0")),
.package(url: "https://github.com/mattpolzin/OpenAPIKit.git", from: "3.0.0"),
Expand Down Expand Up @@ -94,7 +94,7 @@ let package = Package(
.product(name: "JSONAPIOpenAPI", package: "JSONAPI-OpenAPI"),
.product(name: "OpenAPIKit30", package: "OpenAPIKit"),
.product(name: "JSONAPISwiftGen", package: "JSONAPI-OpenAPI"),
.product(name: "ZIPFoundation", package: "ZIPFoundation")
// .product(name: "ZIPFoundation", package: "ZIPFoundation")
])
]
)
5 changes: 3 additions & 2 deletions Sources/SwiftGen/ApiTestPackageSwiftGen.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation
import OpenAPIKit30
import JSONAPISwiftGen
import ZIPFoundation
//import ZIPFoundation

public protocol Logger {
func error(path: String?, context: String, message: String)
Expand Down Expand Up @@ -517,7 +517,8 @@ func archive(from sourcePath: String, to archiveFilePath: String) throws {
try fileManager.removeItem(atPath: archiveFilePath)
}

try fileManager.zipItem(at: source, to: destination)
throw TestPackageSwiftError.executionFailed(stdout: "NEED TO REPLACE ZIPFOUNDATION LIBRARY")
// try fileManager.zipItem(at: source, to: destination)
}

struct DeclNode: Equatable {
Expand Down
Loading