From 4dd0b1b5a9c939c1566ad6686554c200526d411f Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Fri, 22 Apr 2022 00:05:37 +0900 Subject: [PATCH 1/3] move matrix json file into .github --- versions.json => .github/matrix.json | 0 .github/workflows/docker_hub.yml | 4 ++-- .github/workflows/validate.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename versions.json => .github/matrix.json (100%) diff --git a/versions.json b/.github/matrix.json similarity index 100% rename from versions.json rename to .github/matrix.json diff --git a/.github/workflows/docker_hub.yml b/.github/workflows/docker_hub.yml index 7f8a578..0136f7e 100644 --- a/.github/workflows/docker_hub.yml +++ b/.github/workflows/docker_hub.yml @@ -8,7 +8,7 @@ on: - '**/Dockerfile' - 'Dockerfile' - 'entrypoint.sh' - - 'versions.json' + - '.github/matrix.json' schedule: - cron: 0 21 * * 0 workflow_dispatch: @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v3 - id: set-matrix run: | - matrix=$(cat versions.json | jq -c .) + matrix=$(cat .github/matrix.json | jq -c .) echo "::set-output name=matrix::$matrix" build: needs: generate-matrix diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 10d3f68..ca94ab8 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -5,7 +5,7 @@ on: - '.github/workflows/docker_hub.yml' - '.github/workflows/validate.yml' - '**/Dockerfile' - - 'versions.json' + - '.github/matrix.json' env: DOCKER_USER: 41772ki DOCKER_PASS: ${{ secrets.DOCKER_PASS }} @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v3 - id: set-matrix run: | - matrix=$(cat versions.json | jq -c .) + matrix=$(cat .github/matrix.json | jq -c .) echo "::set-output name=matrix::$matrix" validate: needs: generate-matrix From 800e3354e2df9668d373e1214b0416dc4b66bafb Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Fri, 22 Apr 2022 00:06:38 +0900 Subject: [PATCH 2/3] add Swift 5.6 --- .github/matrix.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/matrix.json b/.github/matrix.json index ffc60db..766826f 100644 --- a/.github/matrix.json +++ b/.github/matrix.json @@ -1,12 +1,14 @@ { "swift_version": [ "latest", + "5.6", "5.5", "5.4", "5.3" ], "swiftlint_supported_version": { "latest": "master", + "5.6": "master", "5.5": "master", "5.4": "0.46.5", "5.3": "0.46.5" From 072b77e22e3f3b03dcb5f0d33aea974124c15043 Mon Sep 17 00:00:00 2001 From: 417-72KI <417.72ki@gmail.com> Date: Fri, 22 Apr 2022 02:41:25 +0900 Subject: [PATCH 3/3] bump action --- README.md | 7 +++---- action.yml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index adeba4e..cf4b8a4 100644 --- a/README.md +++ b/README.md @@ -25,15 +25,14 @@ jobs: steps: - uses: actions/checkout@v2 - name: Danger - uses: 417-72KI/danger-swiftlint@v5.5 + uses: 417-72KI/danger-swiftlint@v5.6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ``` ### Note for version -> **Note** Version will match to Swift version since next time. - -- v5(v5.5): Swift 5.5 +- v5.6: Swift 5.6 +- v5.5: Swift 5.5 - v4: Swift 5.4 - v3: Swift 5.3 - v2: Swift 5.2 (no longer updated) diff --git a/action.yml b/action.yml index 6276d2d..6112247 100644 --- a/action.yml +++ b/action.yml @@ -7,7 +7,7 @@ inputs: required: false runs: using: 'docker' - image: 'docker://41772ki/danger-swiftlint:5.5' + image: 'docker://41772ki/danger-swiftlint:5.6' branding: icon: 'alert-circle' color: 'purple'