Skip to content

QOL 2022-04 (Swift 5.6) #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ualch9 wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

QOL 2022-04 (Swift 5.6) #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7b4750
Update gh and docker containers
ualch9 Apr 12, 2022
ce22b26
Remove gh actions linux cache
ualch9 Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# [Choice] Swift version: 5.2, 5.1, 4.2
ARG VARIANT=5.3
ARG VARIANT=5.6
FROM swift:${VARIANT}

# [Option] Install zsh
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"dockerfile": "Dockerfile",
"args": {
// Update the VARIANT arg to pick a Swift version
"VARIANT": "5.2",
"VARIANT": "5.6",
// Options
"INSTALL_NODE": "false",
"NODE_VERSION": "lts/*"
Expand Down Expand Up @@ -39,4 +39,4 @@

// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "vscode"
}
}
12 changes: 6 additions & 6 deletions .github/workflows/apple.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
macos:
runs-on: macos-latest
steps:
- uses: maxim-lobanov/setup-xcode@v1.1
- uses: maxim-lobanov/setup-xcode@v1.4.1
with:
xcode-version: 12
xcode-version: 13
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
Expand All @@ -29,9 +29,9 @@ jobs:
ios:
runs-on: macos-latest
steps:
- uses: maxim-lobanov/setup-xcode@v1.1
- uses: maxim-lobanov/setup-xcode@v1.4.1
with:
xcode-version: 12
xcode-version: 13
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
Expand All @@ -42,10 +42,10 @@ jobs:
- name: Build
run: xcodebuild clean build-for-testing
-scheme 'NationalWeatherService'
-destination 'name=iPhone 11 Pro'
-destination 'name=iPhone 13 Pro'
-quiet
- name: Unit Test
run: xcodebuild test-without-building
-scheme 'NationalWeatherService'
-destination 'name=iPhone 11 Pro'
-destination 'name=iPhone 13 Pro'
-quiet
16 changes: 2 additions & 14 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,21 @@ jobs:
ubuntu:
runs-on: ubuntu-latest
container:
image: swift:5.3
image: swift:5.6.1
options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --security-opt apparmor=unconfined
steps:
- name: Checkout
uses: actions/checkout@v1
- uses: actions/cache@v2
with:
path: .build
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
restore-keys: |
${{ runner.os }}-spm-
- name: Build and Test
run: swift test --enable-test-discovery

amazonlinux:
runs-on: ubuntu-latest
container:
image: swift:5.3-amazonlinux2
image: swift:5.6.1-amazonlinux2
options: --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --security-opt apparmor=unconfined
steps:
- name: Checkout
uses: actions/checkout@v1
- uses: actions/cache@v2
with:
path: .build
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
restore-keys: |
${{ runner.os }}-spm-
- name: Build and Test
run: swift test --enable-test-discovery