Merge branch 'develop'

Author: helje5

.github/workflows/swift.yml

@@ -13,27 +13,28 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - swift:5.5.0-focal
+          - swift:5.5.3-xenial
           - swift:5.6.1-bionic
+          - swift:5.7.2-focal
     container: ${{ matrix.image }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Build Swift Debug Package
         run: swift build -c debug
       - name: Build Swift Release Package
         run: swift build -c release
       - name: Run Tests
-        run: swift test
+        run: swift test --enable-test-discovery
   nextstep:
     runs-on: macos-latest
     steps:
       - name: Select latest available Xcode
-        uses: maxim-lobanov/setup-xcode@v1.2.1
+        uses: maxim-lobanov/setup-xcode@v1.5.1
         with:
-          xcode-version: 13
+          xcode-version: 13.2.1
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Build Swift Debug Package
         run: swift build -c debug
       - name: Build Swift Release Package

Makefile

@@ -8,11 +8,12 @@ SWIFT_TEST=swift test
 CONFIGURATION=release
 
 # docker config
-#SWIFT_BUILD_IMAGE="helje5/swift-dev:5.1.snap2019-07-01"
-#SWIFT_BUILD_IMAGE="swift:5.1.3"
-SWIFT_BUILD_IMAGE="swift:5.0.3"
+#SWIFT_BUILD_IMAGE="swift:5.7.2"
+SWIFT_BUILD_IMAGE="helje5/arm64v8-swift-dev:5.5.3"
 DOCKER_BUILD_DIR=".docker.build"
-SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/x86_64-unknown-linux/$(CONFIGURATION)"
+DOCKER_PLATFORM=aarch64
+#DOCKER_PLATFORM="x86_64"
+SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/$(DOCKER_PLATFORM)-unknown-linux/$(CONFIGURATION)"
 DOCKER_BUILD_PRODUCT="$(DOCKER_BUILD_DIR)/$(TOOL_NAME)"
 
 XENIAL_DESTINATION=/usr/local/lib/swift/dst/x86_64-unknown-linux/swift-5.3-ubuntu16.04.xtoolchain/destination.json
@@ -59,7 +60,7 @@ docker-test: $(DOCKER_BUILD_PRODUCT)
           -v "$(PWD):/src" \
           -v "$(PWD)/$(DOCKER_BUILD_DIR):/src/.build" \
           "$(SWIFT_BUILD_IMAGE)" \
-          bash -c 'cd /src && swift test -c $(CONFIGURATION)'
+          bash -c 'cd /src && swift test --enable-test-discovery -c $(CONFIGURATION)'
 
 docker-clean:
 	rm $(DOCKER_BUILD_PRODUCT)	

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.4
+// swift-tools-version:5.5
 
 import PackageDescription
 
@@ -17,7 +17,7 @@ let package = Package(
 
   dependencies: [
     .package(url: "https://github.com/Macro-swift/Macro.git",
-             from: "0.9.0"),
+             from: "1.0.0"),
     .package(url: "https://github.com/AlwaysRightInstitute/mustache.git",
              from: "1.0.1")
   ],

Sources/express/Route.swift

@@ -351,7 +351,7 @@ open class Route: MiddlewareObject, ErrorMiddlewareObject, RouteKeeper,
     let id = self.id ?? {
       let oids = ObjectIdentifier(self).debugDescription
       // ObjectIdentifier(0x000000010388a610)
-      let dropPrefix = "ObjectIdentifier(0x000000"
+      let dropPrefix = "ObjectIdentifier(0x0000"
       guard oids.hasPrefix(dropPrefix) else { return oids }
       return "0x" + oids.dropFirst(dropPrefix.count).dropLast()
     }()

Tests/LinuxMain.swift

@@ -1,12 +1,3 @@
 import XCTest
-import mimeTests
-import dotenvTests
-import RouteTests
-import multerTests
 
-var tests = [ XCTestCaseEntry ]()
-tests += mimeTests  .allTests()
-tests += dotenvTests.allTests()
-tests += RouteTests .allTests()
-tests += multerTests.allTests()
-XCTMain(tests)
+#error("Swift 5.5 requires --enable-test-discovery")