Skip to content

Commit 03e7100

Browse files
committed
Use the Macro 1.0.0 releases
Implies the latest SwiftNIO and by that the Swift 5.5.2+ requirement.
1 parent f117fc4 commit 03e7100

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

.github/workflows/swift.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
image:
16-
- swift:5.5.0-focal
16+
- swift:5.5.3-xenial
1717
- swift:5.6.1-bionic
18+
- swift:5.7.2-focal
1819
container: ${{ matrix.image }}
1920
steps:
2021
- name: Checkout Repository
21-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2223
- name: Build Swift Debug Package
2324
run: swift build -c debug
2425
- name: Build Swift Release Package
@@ -27,11 +28,11 @@ jobs:
2728
runs-on: macos-latest
2829
steps:
2930
- name: Select latest available Xcode
30-
uses: maxim-lobanov/setup-xcode@v1.2.1
31+
uses: maxim-lobanov/setup-xcode@v1.5.1
3132
with:
32-
xcode-version: 13
33+
xcode-version: 13.2.1
3334
- name: Checkout Repository
34-
uses: actions/checkout@v2
35+
uses: actions/checkout@v3
3536
- name: Build Swift Debug Package
3637
run: swift build -c debug
3738
- name: Build Swift Release Package

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ DOCKER=/usr/local/bin/docker
1010
#DOCKER=docker
1111

1212
# docker config
13-
SWIFT_BUILD_IMAGE="swift:5.0"
14-
#SWIFT_BUILD_IMAGE="swift:5.3.1"
15-
#SWIFT_BUILD_IMAGE="swift:5.1.3"
16-
DOCKER_BUILD_DIR=".docker$(SWIFT_BUILD_DIR)"
17-
SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/x86_64-unknown-linux/$(CONFIGURATION)"
13+
#SWIFT_BUILD_IMAGE="swift:5.7.2"
14+
SWIFT_BUILD_IMAGE="helje5/arm64v8-swift-dev:5.5.3"
15+
DOCKER_BUILD_DIR=".docker.build"
16+
DOCKER_PLATFORM=aarch64
17+
#DOCKER_PLATFORM="x86_64"
18+
SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/$(DOCKER_PLATFORM)-unknown-linux/$(CONFIGURATION)"
1819
DOCKER_BUILD_PRODUCT="$(DOCKER_BUILD_DIR)/$(TOOL_NAME)"
1920

2021

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.4
1+
// swift-tools-version:5.5
22

33
import PackageDescription
44

@@ -12,9 +12,9 @@ let package = Package(
1212

1313
dependencies: [
1414
.package(url: "https://github.com/Macro-swift/Macro.git",
15-
from: "0.9.0"),
15+
from: "1.0.0"),
1616
.package(url: "https://github.com/Macro-swift/MacroExpress.git",
17-
from: "0.9.0"),
17+
from: "1.0.0"),
1818
.package(url: "https://github.com/helje5/SwiftXmlRpc.git",
1919
from: "0.8.6")
2020
],

0 commit comments

Comments
 (0)