Skip to content

Commit e91a0c3

Browse files
committed
Merge branch 'develop'
2 parents 68828b8 + c10825f commit e91a0c3

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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ SWIFT_BUILD_DIR=.build
77
CONFIGURATION=release
88

99
# docker config
10-
SWIFT_BUILD_IMAGE="swift:5.3.1"
11-
#SWIFT_BUILD_IMAGE="swift:5.1.3"
12-
#SWIFT_BUILD_IMAGE="swift:5.0.3"
10+
#SWIFT_BUILD_IMAGE="swift:5.7.2"
11+
SWIFT_BUILD_IMAGE="helje5/arm64v8-swift-dev:5.5.3"
1312
DOCKER_BUILD_DIR=".docker.build"
14-
SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/x86_64-unknown-linux/$(CONFIGURATION)"
13+
DOCKER_PLATFORM=aarch64
14+
#DOCKER_PLATFORM="x86_64"
15+
SWIFT_DOCKER_BUILD_DIR="$(DOCKER_BUILD_DIR)/$(DOCKER_PLATFORM)-unknown-linux/$(CONFIGURATION)"
1516
DOCKER_BUILD_PRODUCT="$(DOCKER_BUILD_DIR)/$(TOOL_NAME)"
1617

1718
XENIAL_DOCKER_IMAGE=swiftlang/swift:nightly-5.3-xenial

Package.swift

Lines changed: 4 additions & 4 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

@@ -25,11 +25,11 @@ let package = Package(
2525
// A lot of packages for demonstration purposes, only add what you
2626
// actually need in your own project.
2727
.package(url: "https://github.com/Macro-swift/Macro.git",
28-
from: "0.9.0"),
28+
from: "1.0.0"),
2929
.package(url: "https://github.com/Macro-swift/MacroExpress.git",
30-
from: "0.9.0"),
30+
from: "1.0.0"),
3131
.package(url: "https://github.com/Macro-swift/MacroLambda.git",
32-
from: "0.4.1"),
32+
from: "0.5.0"),
3333
.package(url: "https://github.com/AlwaysRightInstitute/cows",
3434
from: "1.0.10")
3535
],

0 commit comments

Comments
 (0)