Skip to content

Commit 6ac5394

Browse files
committed
Merge branch 'develop'
2 parents 13ebd37 + ad0613b commit 6ac5394

File tree

4 files changed

+28
-20
lines changed

4 files changed

+28
-20
lines changed

.github/workflows/swift.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Test
1+
name: Build
22

33
on:
44
push:
@@ -13,14 +13,13 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
image:
16-
- swift:5.2.5-xenial
17-
- swift:5.3.2-xenial
18-
- swift:5.3.2-bionic
19-
- swift:5.5.0-focal
16+
- swift:5.5.3-xenial
17+
- swift:5.6.1-bionic
18+
- swift:5.7.2-focal
2019
container: ${{ matrix.image }}
2120
steps:
2221
- name: Checkout Repository
23-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2423
- name: Build Swift Debug Package
2524
run: swift build -c debug
2625
- name: Build Swift Release Package
@@ -29,11 +28,11 @@ jobs:
2928
runs-on: macos-latest
3029
steps:
3130
- name: Select latest available Xcode
32-
uses: maxim-lobanov/setup-xcode@v1.2.1
31+
uses: maxim-lobanov/setup-xcode@v1.5.1
3332
with:
34-
xcode-version: 13
33+
xcode-version: 13.2.1
3534
- name: Checkout Repository
36-
uses: actions/checkout@v2
35+
uses: actions/checkout@v3
3736
- name: Build Swift Debug Package
3837
run: swift build -c debug
3938
- 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
],

README.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ app.listen(1337)
4040
- `macro.router.matcher.debug`
4141
- `macro.router.walker.debug`
4242

43+
## Async/Await
44+
45+
This doesn't support `async`/`await` yet as proper streaming
46+
would require custom executors. Which are not yet available.
47+
48+
Maybe a temporary measure would be appropriate just for XML-RPC (which
49+
rarely has streaming consumers/producers).
50+
4351
### Links
4452

4553
- [Writing an Swift XML-RPC Server](http://www.alwaysrightinstitute.com/macro-xmlrpc/)
@@ -56,13 +64,13 @@ app.listen(1337)
5664

5765
**Macro XML-RPC** is brought to you by
5866
the
59-
[Always Right Institute](http://www.alwaysrightinstitute.com)
67+
[Helge Heß](https://helgehess.eu/)
6068
and
61-
[ZeeZide](http://zeezide.de).
69+
[ZeeZide](https://zeezide.de).
6270
We like
6371
[feedback](https://twitter.com/ar_institute),
6472
GitHub stars,
65-
cool [contract work](http://zeezide.com/en/services/services.html),
73+
cool [contract work](https://zeezide.com/en/services/services.html),
6674
presumably any form of praise you can think of.
6775

6876
There is a `#microexpress` channel on the

0 commit comments

Comments
 (0)