diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 96fefb9..baaf5b1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -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 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0543bbe..1db4d92 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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/*" @@ -39,4 +39,4 @@ // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. // "remoteUser": "vscode" -} \ No newline at end of file +} diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml index 22b5018..32d9058 100644 --- a/.github/workflows/apple.yml +++ b/.github/workflows/apple.yml @@ -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: @@ -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: @@ -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 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 0da517a..7f992a2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -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