Skip to content

Commit

Permalink
Use Swift 5.4 for Windows job on GitHub Actions (#89)
Browse files Browse the repository at this point in the history
* Use Swift 5.4 for Windows job on GitHub Actions

* Prevent jobs from running twice on pull requests

* Update Swift Argument Parser to 0.5.0
  • Loading branch information
MaxDesiatov authored Sep 10, 2021
1 parent 9888e23 commit a0564bf
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/tests_mac.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: tests-macos
on: [push, pull_request]
on:
push:
branches: [main]
pull_request:

jobs:
macOS:
name: macOS
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/tests_ubuntu.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: tests-ubuntu
on: [push, pull_request]
on:
push:
branches: [main]
pull_request:

jobs:
ubuntu:
name: Ubuntu 18.04
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/tests_windows.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
name: tests-windows
on: [push, pull_request]
on:
push:
branches: [main]
pull_request:

jobs:
windows:
name: windows
runs-on: windows-latest
steps:
- uses: seanmiddleditch/gha-setup-vsdevenv@master
- uses: seanmiddleditch/gha-setup-vsdevenv@v3

- name: Install swift-DEVELOPMENT-SNAPSHOT-2020-09-22-a
- name: Install Swift 5.4
run: |
Install-Binary -Url "https://swift.org/builds/development/windows10/swift-DEVELOPMENT-SNAPSHOT-2020-09-22-a/swift-DEVELOPMENT-SNAPSHOT-2020-09-22-a-windows10.exe" -Name "installer.exe" -ArgumentList ("-q")
Install-Binary -Url "https://swift.org/builds/swift-5.4.2-release/windows10/swift-5.4.2-RELEASE/swift-5.4.2-RELEASE-windows10.exe" -Name "installer.exe" -ArgumentList ("-q")
- name: Set Environment Variables
run: |
Expand All @@ -32,7 +36,7 @@ jobs:
run: swift --version

- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v2

- name: Build
run: swift build -v
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/apple/swift-argument-parser",
"state": {
"branch": null,
"revision": "eb51f949cdd0c9d88abba9ce79d37eb7ea1231d0",
"version": "0.2.0"
"revision": "6b2aa2748a7881eebb9f84fb10c01293e15b52ca",
"version": "0.5.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ let package = Package(
targets: ["Benchmark"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-argument-parser", from: "0.0.1"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "0.5.0"),
],
targets: [
.target(
Expand Down

0 comments on commit a0564bf

Please sign in to comment.