From 4857fbf33e1abfa7c2d0e58e9d439fdfcca9194f Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 21:47:22 +0900 Subject: [PATCH 01/26] =?UTF-8?q?test:=20swift.yml=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/swift.yml diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml new file mode 100644 index 0000000..1eeb976 --- /dev/null +++ b/.github/workflows/swift.yml @@ -0,0 +1,33 @@ +# This workflow will build a Swift project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift + +name: Swift Build and Test + +on: + push: + branches: [ "feat/" ] + pull_request: + branches: [ "cluster_develop" ] + + +jobs: + build: + name: Swift ${{ matrix.swift }} on ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macOS 10.15.7] + swift: ["5.3.2"] + + runs-on: ${{ matrix.swift }} + + steps: + - uses: actions/checkout@v3 + - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf + with: + swift-version: ${{ matrix.swift }} + + - name: Build + run: swift build + + - name: Run tests + run: swift test From db6fb37c944a25dd98c46950655e82409c813229 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 21:52:51 +0900 Subject: [PATCH 02/26] =?UTF-8?q?refactor:=20=EC=84=B8=EB=B6=80=EB=B8=8C?= =?UTF-8?q?=EB=9E=9C=EC=B9=98=20=EC=B6=94=EA=B0=80=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 1eeb976..c94e03e 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -5,9 +5,9 @@ name: Swift Build and Test on: push: - branches: [ "feat/" ] + branches: [ "feat/*", "fix/*" ] pull_request: - branches: [ "cluster_develop" ] + branches: [ "cluster_develop", "cluster_main", "main" ] jobs: From 3bce4a477ecfa7949d837459efb0cb1260b24b3e Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:00:21 +0900 Subject: [PATCH 03/26] =?UTF-8?q?fix:=20os,=20version=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index c94e03e..5624acb 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -1,5 +1,7 @@ # This workflow will build a Swift project # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift +# Author by chanhihi +# Date 2023.08.09 name: Swift Build and Test @@ -9,25 +11,22 @@ on: pull_request: branches: [ "cluster_develop", "cluster_main", "main" ] - jobs: build: name: Swift ${{ matrix.swift }} on ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macOS 10.15.7] + os: [ubuntu-latest, macos-10.15] swift: ["5.3.2"] - - runs-on: ${{ matrix.swift }} - + + runs-on: ${{ matrix.os }} + steps: - uses: actions/checkout@v3 - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf with: swift-version: ${{ matrix.swift }} - - name: Build run: swift build - - name: Run tests run: swift test From 0b850024b681561e4cacfdfc657a3857c99a6193 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:03:40 +0900 Subject: [PATCH 04/26] =?UTF-8?q?=20fix:=20os,=20version=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 5624acb..c6991a5 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -16,8 +16,8 @@ jobs: name: Swift ${{ matrix.swift }} on ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-10.15] - swift: ["5.3.2"] + os: [macos-10.15] + swift: ["5.3"] runs-on: ${{ matrix.os }} From 455f9a0794cce11953e106cd84009fcb98eb95b0 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:05:40 +0900 Subject: [PATCH 05/26] =?UTF-8?q?fix:=20os=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index c6991a5..a164b94 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -16,7 +16,7 @@ jobs: name: Swift ${{ matrix.swift }} on ${{ matrix.os }} strategy: matrix: - os: [macos-10.15] + os: [ubuntu-latest, macos-10.15] swift: ["5.3"] runs-on: ${{ matrix.os }} From 0e401719ef2bfc9492e13b5607aef4ab0886a898 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:08:35 +0900 Subject: [PATCH 06/26] =?UTF-8?q?fix:=20set-upactions/version=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index a164b94..a7d5de2 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -17,12 +17,12 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-10.15] - swift: ["5.3"] + swift: [5.3] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: swift-actions/setup-swift@v2 - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf with: swift-version: ${{ matrix.swift }} From 5779e3c46cb055522033163536f7ee61d4314138 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:15:28 +0900 Subject: [PATCH 07/26] =?UTF-8?q?fix:=20actions/set-up=20version=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index a7d5de2..f948ea9 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -22,8 +22,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: swift-actions/setup-swift@v2 - - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf + - uses: setup-actions/setup-swift@v1.6.0 with: swift-version: ${{ matrix.swift }} - name: Build From add37421d01fd2e42baf987705c347d77c999c64 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:17:40 +0900 Subject: [PATCH 08/26] =?UTF-8?q?=20fix:=20actions/set-up=20version=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index f948ea9..d07c7ce 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -22,7 +22,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: setup-actions/setup-swift@v1.6.0 + - uses: setup-actions/setup-swift@v1 with: swift-version: ${{ matrix.swift }} - name: Build From 5462ba8fd9829513743c09ac43dd731a545e9132 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:18:45 +0900 Subject: [PATCH 09/26] =?UTF-8?q?=20fix:=20actions/set-up=20version=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index d07c7ce..25b5d41 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-10.15] - swift: [5.3] + swift: ['5.3'] runs-on: ${{ matrix.os }} From d8295e83c97688268875e964016bbbf34a27902d Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:19:24 +0900 Subject: [PATCH 10/26] =?UTF-8?q?=20fix:=20actions/set-up=20version=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 25b5d41..da0c4ee 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -22,7 +22,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: setup-actions/setup-swift@v1 + - uses: setup-actions/setup-swift@v3 with: swift-version: ${{ matrix.swift }} - name: Build From 4473a7e4bf7c067d76283ff2de2bd14441787af5 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sat, 19 Aug 2023 22:34:04 +0900 Subject: [PATCH 11/26] =?UTF-8?q?fix:=20actions/set-up=20version=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index da0c4ee..a164b94 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -17,12 +17,13 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-10.15] - swift: ['5.3'] + swift: ["5.3"] runs-on: ${{ matrix.os }} steps: - - uses: setup-actions/setup-swift@v3 + - uses: actions/checkout@v3 + - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf with: swift-version: ${{ matrix.swift }} - name: Build From 6e335b189504179e6e4ff3d883129dd566c53bae Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 09:56:40 +0900 Subject: [PATCH 12/26] =?UTF-8?q?fix:=20actions/set-up=20version=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index a164b94..0746c14 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf + - uses: swift-actions/setup-swift@v1.6.0 with: swift-version: ${{ matrix.swift }} - name: Build From 04664eca9b987d416d728b23f199eeafdbd6483b Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 09:59:03 +0900 Subject: [PATCH 13/26] =?UTF-8?q?fix:=20=EC=9A=B0=EB=B6=84=ED=88=AC=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=88=98=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 0746c14..061091e 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -16,7 +16,7 @@ jobs: name: Swift ${{ matrix.swift }} on ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-10.15] + os: [ubuntu-20.04, macos-10.15] swift: ["5.3"] runs-on: ${{ matrix.os }} From d2fd5e2b7dc3fb2eb22c5a591d5a463bbd1f128a Mon Sep 17 00:00:00 2001 From: chanhihi Date: Sun, 20 Aug 2023 19:11:20 +0900 Subject: [PATCH 14/26] =?UTF-8?q?test:=20=EC=A0=95=EC=83=81=EC=A0=81?= =?UTF-8?q?=EC=9D=B8=20build=20=ED=99=95=EC=9D=B8=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20Package.swift=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Package.swift | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..32e0316 --- /dev/null +++ b/Package.swift @@ -0,0 +1,28 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Box42", + platforms: [ + .macOS(.v10_15), + ], + products: [ + .library( + name: "Box42", + targets: ["Box42"]), + ], + dependencies: [ + .package(url: "https://github.com/SnapKit/SnapKit", from: "5.6.0"), + ], + targets: [ + .target( + name: "Box42", + dependencies: ["SnapKit"], + resources: [.process("Box42/Resources/Assets.xcassets"), + .process("Box42/Resources/Main.storyboard"), + .process("Box42/Resources/sh/*.sh")] + ), + ] +) From 24beb318b74e9b8327faecfab2c2708092ef730a Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 19:18:41 +0900 Subject: [PATCH 15/26] =?UTF-8?q?fix:=20build=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=EC=A7=84=ED=96=89=ED=95=A9=EB=8B=88?= =?UTF-8?q?=EB=8B=A4.=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 061091e..a1fbb5b 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -27,6 +27,8 @@ jobs: with: swift-version: ${{ matrix.swift }} - name: Build - run: swift build - - name: Run tests - run: swift test + run: | + mkdir Sources && + mv Box42 Sources/Box42 && + swift build + From 072dda623b58f5a631892262f63df1470ea0b480 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 19:26:16 +0900 Subject: [PATCH 16/26] fix: setup-swift --- .github/workflows/swift.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index a1fbb5b..5f89abd 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -22,10 +22,10 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: swift-actions/setup-swift@v1.6.0 + - uses: swift-actions/setup-swift@v1 with: swift-version: ${{ matrix.swift }} + - name: Build run: | mkdir Sources && From 5bb4758bb30a98c4d8f24e586d4fc1dfacac37e5 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 19:32:38 +0900 Subject: [PATCH 17/26] =?UTF-8?q?fix:=20unbuntu=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=9D=84=20=EC=82=AD=EC=A0=9C=ED=95=A9=EB=8B=88=EB=8B=A4.=20?= =?UTF-8?q?=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 5f89abd..42e53bd 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -1,5 +1,3 @@ -# This workflow will build a Swift project -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift # Author by chanhihi # Date 2023.08.09 @@ -16,7 +14,7 @@ jobs: name: Swift ${{ matrix.swift }} on ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-10.15] + os: [macos-10.15] swift: ["5.3"] runs-on: ${{ matrix.os }} @@ -31,4 +29,6 @@ jobs: mkdir Sources && mv Box42 Sources/Box42 && swift build - + +# This workflow will build a Swift project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift From e74eda3e2cba25bcfc05faf3789d5c58ecb6082d Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 19:52:34 +0900 Subject: [PATCH 18/26] =?UTF-8?q?refactor(yml):=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=EB=90=9C=20=EB=B6=80=EB=B6=84=EC=9D=84=20=EC=A0=9C=EA=B1=B0?= =?UTF-8?q?=ED=95=98=EA=B3=A0=20build=EB=A7=8C=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=ED=95=A9=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 42e53bd..eddcbd1 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -11,18 +11,15 @@ on: jobs: build: - name: Swift ${{ matrix.swift }} on ${{ matrix.os }} - strategy: - matrix: - os: [macos-10.15] - swift: ["5.3"] - - runs-on: ${{ matrix.os }} + name: Swift 5.3 on macOS 10.15 + runs-on: macos-10.15 steps: + - uses: actions/checkout@v2 + - uses: swift-actions/setup-swift@v1 with: - swift-version: ${{ matrix.swift }} + swift-version: 5.3 - name: Build run: | From 719aa77accce30c913bc676a9bde62df3dc2564d Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 20:00:50 +0900 Subject: [PATCH 19/26] =?UTF-8?q?fix:=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index eddcbd1..c45b111 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -5,9 +5,9 @@ name: Swift Build and Test on: push: - branches: [ "feat/*", "fix/*" ] + branches: [ "feat/*", "fix/*", "refactor/*", "cluster_main", "main" ] pull_request: - branches: [ "cluster_develop", "cluster_main", "main" ] + branches: [ "cluster_develop" ] jobs: build: @@ -15,17 +15,19 @@ jobs: runs-on: macos-10.15 steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v3 - - uses: swift-actions/setup-swift@v1 - with: - swift-version: 5.3 + - name: setup-swift + uses: swift-actions/setup-swift@v1 + with: + swift-version: 5.3 - - name: Build - run: | - mkdir Sources && - mv Box42 Sources/Box42 && - swift build + - name: Build + run: | + mkdir Sources && + mv Box42 Sources/Box42 && + swift build # This workflow will build a Swift project # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift From dd31c5ae7467207c4d8c011b8f1cea17f078126e Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 20:03:08 +0900 Subject: [PATCH 20/26] =?UTF-8?q?fix:=20macos-latest=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index c45b111..febc450 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -12,7 +12,7 @@ on: jobs: build: name: Swift 5.3 on macOS 10.15 - runs-on: macos-10.15 + runs-on: macos-latest steps: - name: Checkout From b4a502f0c75d0e3c1b8bc05cd370da5c2b730cd9 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 20:10:36 +0900 Subject: [PATCH 21/26] =?UTF-8?q?refactor(swift):=20xcode=EB=B2=84?= =?UTF-8?q?=EC=A0=84=EA=B3=BC=20sdk=EB=A5=BC=20=EA=B3=A0=EC=A0=95=EC=8B=9C?= =?UTF-8?q?=ED=82=B5=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index febc450..1362b37 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -1,7 +1,7 @@ # Author by chanhihi # Date 2023.08.09 -name: Swift Build and Test +name: Swift Build on: push: @@ -12,16 +12,21 @@ on: jobs: build: name: Swift 5.3 on macOS 10.15 - runs-on: macos-latest + runs-on: macos-10.15 steps: - name: Checkout uses: actions/checkout@v3 + - name: Set Xcode version + run: | + sudo xcode-select -s '/Applications/Xcode_12.3.app/Contents/Developer' + echo 'SDKROOT=/Applications/Xcode_12.3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk' >> $GITHUB_ENV + - name: setup-swift uses: swift-actions/setup-swift@v1 with: - swift-version: 5.3 + swift-version: 5.3 - name: Build run: | From eee18c2dd2d07f29974d113ddc31d42e5fd50e9c Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 20:12:10 +0900 Subject: [PATCH 22/26] =?UTF-8?q?fix:=20macos-lastest=EB=A1=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=ED=95=A9=EB=8B=88=EB=8B=A4.=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 1362b37..4e79c67 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -12,8 +12,7 @@ on: jobs: build: name: Swift 5.3 on macOS 10.15 - runs-on: macos-10.15 - + runs-on: macos-lastest steps: - name: Checkout uses: actions/checkout@v3 From 08ba11fb41b817d5bd64b59ca65299c3096be4e8 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 20:14:25 +0900 Subject: [PATCH 23/26] =?UTF-8?q?fix:=20=F0=9F=A7=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 4e79c67..306c638 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -12,7 +12,7 @@ on: jobs: build: name: Swift 5.3 on macOS 10.15 - runs-on: macos-lastest + runs-on: macos-latest steps: - name: Checkout uses: actions/checkout@v3 From a44fe22172557a21d95c44b28106b78ce099dcf7 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 20:19:19 +0900 Subject: [PATCH 24/26] =?UTF-8?q?fix:=20macos-11=20=F0=9F=96=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 306c638..57b3477 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -11,9 +11,13 @@ on: jobs: build: - name: Swift 5.3 on macOS 10.15 - runs-on: macos-latest + name: Swift 5.3 on macOS 10.15 + runs-on: macos-11 steps: + - name: List Xcode versions + run: | + ls /Applications | grep Xcode + - name: Checkout uses: actions/checkout@v3 From 31ed54fc4896f94d79a9696c40f50c69d77d77a4 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 20:24:49 +0900 Subject: [PATCH 25/26] =?UTF-8?q?fix:=20xcode=20=EB=B2=84=EC=A0=84=2012.4?= =?UTF-8?q?=20=EB=B0=8F=20SDK=20=EA=B3=A0=EC=A0=95=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 57b3477..45f6a6a 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -11,20 +11,20 @@ on: jobs: build: - name: Swift 5.3 on macOS 10.15 + name: Swift 5.3 on macOS 11 runs-on: macos-11 steps: - - name: List Xcode versions - run: | - ls /Applications | grep Xcode - - name: Checkout uses: actions/checkout@v3 + - name: Set Xcode version + run: + sudo xcode-select -s '/Applications/Xcode_12.4.0.app/Contents/Developer' + - name: Set Xcode version run: | - sudo xcode-select -s '/Applications/Xcode_12.3.app/Contents/Developer' - echo 'SDKROOT=/Applications/Xcode_12.3.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk' >> $GITHUB_ENV + xcodebuild -showsdks + echo 'SDKROOT=/Applications/Xcode_12.4.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk' >> $GITHUB_ENV - name: setup-swift uses: swift-actions/setup-swift@v1 From 2732a2486bd9d30bcb4daa50c175ca4e31fc2ae9 Mon Sep 17 00:00:00 2001 From: KIM CHAN HEE <85754295+chanhihi@users.noreply.github.com> Date: Sun, 20 Aug 2023 20:32:20 +0900 Subject: [PATCH 26/26] =?UTF-8?q?fix:=20build=20test=20=F0=9F=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 45f6a6a..668423e 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -21,9 +21,8 @@ jobs: run: sudo xcode-select -s '/Applications/Xcode_12.4.0.app/Contents/Developer' - - name: Set Xcode version - run: | - xcodebuild -showsdks + - name: Set SDK version + run: echo 'SDKROOT=/Applications/Xcode_12.4.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk' >> $GITHUB_ENV - name: setup-swift