Use Swift 5.7.2 and Xcode 14.2 (#84)

* Use Swift 5.7.2 and Xcode 14.2 * Use ubuntu-20.04 for Swift 5.6
sushichop · Mar 11, 2023 · afd4a5a · afd4a5a
1 parent c758db7
commit afd4a5a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,17 +16,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ['macos-12', 'ubuntu-20.04', 'windows-latest']
-        swift-version: ['5.6', '5.7.1']
+        os: ['macos-latest', 'ubuntu-20.04', 'windows-latest']
+        swift-version: ['5.6', '5.7.2']
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - name: Select Xcode if needed - Swift ${{ matrix.swift-version }} 
         if: runner.os == 'macOS'
         run: |
-          ls -al
+          ls -al /Applications
           if [ '${{ matrix.swift-version }}' = '5.6' ]; then echo DEVELOPER_DIR=/Applications/Xcode_13.3.app >> $GITHUB_ENV; fi
-          if [ '${{ matrix.swift-version }}' = '5.7.1' ]; then echo DEVELOPER_DIR=/Applications/Xcode_14.1.app >> $GITHUB_ENV; fi
+          if [ '${{ matrix.swift-version }}' = '5.7.2' ]; then echo DEVELOPER_DIR=/Applications/Xcode_14.2.app >> $GITHUB_ENV; fi
       - uses: sushichop/gha-swift-env@v1
         with:
           swift-version: ${{ matrix.swift-version }}
@@ -40,17 +40,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ['macos-12', 'ubuntu-20.04', 'windows-latest']
-        swift-version: ['5.7.1']
+        os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
+        swift-version: ['5.7.2']
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - name: Select Xcode if needed - Swift ${{ matrix.swift-version }} 
         if: runner.os == 'macOS'
         run: |
-          ls -al
+          ls -al /Applications
           if [ '${{ matrix.swift-version }}' = '5.6' ]; then echo DEVELOPER_DIR=/Applications/Xcode_13.3.app >> $GITHUB_ENV; fi
-          if [ '${{ matrix.swift-version }}' = '5.7.1' ]; then echo DEVELOPER_DIR=/Applications/Xcode_14.1.app >> $GITHUB_ENV; fi
+          if [ '${{ matrix.swift-version }}' = '5.7.2' ]; then echo DEVELOPER_DIR=/Applications/Xcode_14.2.app >> $GITHUB_ENV; fi
       - uses: sushichop/gha-swift-env@v1
         with:
           swift-version: ${{ matrix.swift-version }}
@@ -60,10 +60,10 @@ jobs:
 
   codecov:
     name: codecov - Xcode ${{ matrix.xcode }}
-    runs-on: macos-12
+    runs-on: macos-latest
     strategy:
       matrix:
-        xcode: ['14.1']
+        xcode: ['14.2']
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
@@ -80,7 +80,7 @@ jobs:
 
   xcode:
     name: ${{ matrix.make-target }} - Xcode ${{ matrix.xcode }}
-    runs-on: macos-12
+    runs-on: macos-latest
     strategy:
       matrix:
         make-target:
@@ -90,7 +90,7 @@ jobs:
             carthage-build-workaround,
             carthage-build-xcframeworks,
           ]
-        xcode: ['14.1']
+        xcode: ['14.2']
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
@@ -100,10 +100,10 @@ jobs:
 
   cocoapods:
     name: CocoaPods - Xcode ${{ matrix.xcode }}
-    runs-on: macos-12
+    runs-on: macos-latest
     strategy:
       matrix:
-        xcode: ['14.1']
+        xcode: ['14.2']
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
@@ -118,17 +118,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ['macos-12', 'ubuntu-20.04']
-        swift-version: ['5.7.1']
+        os: ['macos-latest', 'ubuntu-latest']
+        swift-version: ['5.7.2']
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - name: Select Xcode if needed - Swift ${{ matrix.swift-version }} 
         if: runner.os == 'macOS'
         run: |
-          ls -al
+          ls -al /Applications
           if [ '${{ matrix.swift-version }}' = '5.6' ]; then echo DEVELOPER_DIR=/Applications/Xcode_13.3.app >> $GITHUB_ENV; fi
-          if [ '${{ matrix.swift-version }}' = '5.7.1' ]; then echo DEVELOPER_DIR=/Applications/Xcode_14.1.app >> $GITHUB_ENV; fi
+          if [ '${{ matrix.swift-version }}' = '5.7.2' ]; then echo DEVELOPER_DIR=/Applications/Xcode_14.2.app >> $GITHUB_ENV; fi
       - uses: sushichop/gha-swift-env@v1
         with:
           swift-version: ${{ matrix.swift-version }}

diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -14,7 +14,7 @@ jobs:
     if: |
       github.event_name == 'pull_request'
       && github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: macos-12
+    runs-on: macos-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -33,7 +33,7 @@ jobs:
       github.event_name == 'issue_comment' && github.event.action == 'created'
       && github.event.issue.pull_request != null
       && startsWith(github.event.comment.body, '/check')
-    runs-on: macos-12
+    runs-on: macos-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -42,7 +42,7 @@ jobs:
         with:
           required-permission: write
           reaction-permitted: rocket
-          comment-not-permitted: Sorry, you don't have enough permission to execute `/danger`...
+          comment-not-permitted: Sorry, you don't have enough permission to execute `/check`...
       - name: Clone the PR source
         uses: actions/checkout@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Make `dateFormat` function more efficient. [#81](https://github.com/sushichop/Puppy/pull/81)
 - Update `Logging` module to 1.5.2 or later. [#82](https://github.com/sushichop/Puppy/pull/82)
 - Export `Logging` module. [#83](https://github.com/sushichop/Puppy/pull/83)
+- Use Swift 5.7.2 and Xcode 14.2. [#84](https://github.com/sushichop/Puppy/pull/84)
 
 ## [0.6.0](https://github.com/sushichop/Puppy/releases/tag/0.6.0) (2022-11-29)
 

diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 .DEFAULT_GOAL := help
 HELP_INDENT := 28
 
-SWIFT_VERSION := 5.7.1
-DISTRIBUTION := focal
+SWIFT_VERSION := 5.7.2
+DISTRIBUTION := jammy
 
 .PHONY: help
 help: