Skip to content

Commit 40a196f

Browse files
committed
Merge branch 'release/1.0.1'
2 parents b36fdf3 + 4b65bdd commit 40a196f

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [1.0.1]
10+
### Removed
11+
- Remove default option on `swift-image-tag`
12+
13+
### Fixed
14+
- Fixes a bug that prevent to work.
15+
916
## [1.0.0]
1017
This is the initial release.
1118

12-
[Unreleased]: https://github.com/sinoru/swift-snowflake/compare/v1.0.0...HEAD
19+
[Unreleased]: https://github.com/sinoru/swift-snowflake/compare/v1.0.1...HEAD
20+
[1.0.1]: https://github.com/sinoru/swift-snowflake/releases/tag/v1.0.0...v1.0.1
1321
[1.0.0]: https://github.com/sinoru/swift-snowflake/releases/tag/v1.0.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
- uses: actions/checkout@v3
2727
- uses: sinoru/actions-swift@v1
2828
with:
29-
swift-image-tag: '5.6'
29+
swift-image-tag: 'latest'
3030
args: 'build'
3131
- uses: sinoru/actions-swift@v1
3232
with:
33-
swift-image-tag: '5.6'
33+
swift-image-tag: 'latest'
3434
args: 'test'
3535

3636
swift-without-docker:

action.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ inputs:
1111
swift-image-tag:
1212
description: 'A Swift docker image tag to use.'
1313
required: false
14-
default: 'latest'
1514
swift-version:
1615
description: 'A Swift version to download using swift-env.'
1716
required: false
@@ -21,17 +20,18 @@ inputs:
2120
runs:
2221
using: 'composite'
2322
steps:
24-
- if: ${{ inputs.swift-image-tag == null && inputs.swift-version != null }}
23+
- if: ${{ inputs.swift-version != null }}
2524
uses: sinoru/actions-setup-swift@v2
2625
with:
2726
swift-version: ${{ inputs.swift-version }}
28-
- if: ${{ inputs.swift-image-tag == null }}
29-
shell: bash
30-
run: '"${{ github.action_path }}/swift" ${{ inputs.args }}'
3127

3228
- if: ${{ inputs.swift-image-tag != null }}
3329
shell: bash
3430
run: docker pull swift:${{ inputs.swift-image-tag }}
31+
32+
- if: ${{ inputs.swift-image-tag == null }}
33+
shell: bash
34+
run: '"${{ github.action_path }}/swift" ${{ inputs.args }}'
3535
- if: ${{ inputs.swift-image-tag != null }}
3636
shell: bash
3737
run: |

swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44

55
set -o pipefail
66

7-
swift "$@" | libexec/github-action-output-handler
7+
BASE_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
8+
9+
swift "$@" | "$BASE_DIR/libexec/github-action-output-handler"

0 commit comments

Comments
 (0)