diff --git a/.github/workflows/branch-1.0.x-development.yml b/.github/workflows/branch-1.0.x-development.yml index 909099b1..c69d4ec8 100644 --- a/.github/workflows/branch-1.0.x-development.yml +++ b/.github/workflows/branch-1.0.x-development.yml @@ -7,7 +7,7 @@ name: Test for branch "1.0.x/development" branches: - 1.0.x/development tags: - - "!*" + - "!**" jobs: branch-test: name: Test of Action-setup-swift @@ -17,7 +17,7 @@ jobs: - ubuntu-latest - macOS-latest swift-version: - - 5.1.1 + - 5.1.2 - DEVELOPMENT-SNAPSHOT-2019-10-21-a runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/branch-1.0.x-experiment.yml b/.github/workflows/branch-1.0.x-experiment.yml index 275ffc6c..73b633c7 100644 --- a/.github/workflows/branch-1.0.x-experiment.yml +++ b/.github/workflows/branch-1.0.x-experiment.yml @@ -7,7 +7,7 @@ name: Test for branch "1.0.x/experiment" branches: - 1.0.x/experiment tags: - - "!*" + - "!**" jobs: branch-test: name: Test of Action-setup-swift @@ -17,7 +17,7 @@ jobs: - ubuntu-latest - macOS-latest swift-version: - - 5.1.1 + - 5.1.2 - DEVELOPMENT-SNAPSHOT-2019-10-21-a runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/branch-master.yml b/.github/workflows/branch-master.yml index 9c05c14d..1b09e49f 100644 --- a/.github/workflows/branch-master.yml +++ b/.github/workflows/branch-master.yml @@ -7,7 +7,7 @@ name: Test for branch "master" branches: - master tags: - - "!*" + - "!**" jobs: branch-test: name: Test of Action-setup-swift @@ -17,7 +17,7 @@ jobs: - ubuntu-latest - macOS-latest swift-version: - - 5.1.1 + - 5.1.2 - DEVELOPMENT-SNAPSHOT-2019-10-21-a runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/check-commits.yml b/.github/workflows/check-commits.yml index c74569b5..2a92952d 100644 --- a/.github/workflows/check-commits.yml +++ b/.github/workflows/check-commits.yml @@ -5,14 +5,14 @@ name: Check commits "on": push: branches: - - "*" - - "*/*" + - "**" + - "!no-tests/**" tags: - - "!*" + - "!**" pull_request: branches: - - "*" - - "*/*" + - "**" + - "!no-tests/**" jobs: check-modules: name: Check whether or not unnecessary modules are installed. diff --git a/.github/workflows/direct-test.yml b/.github/workflows/direct-test.yml index cb5867fb..bc414ca1 100644 --- a/.github/workflows/direct-test.yml +++ b/.github/workflows/direct-test.yml @@ -5,17 +5,17 @@ name: Direct Test "on": push: branches: - - "*" - - "*/*" + - "**" + - "!no-tests/**" - "!master" - "!1.0.x/development" - "!1.0.x/experiment" tags: - - "!*" + - "!**" pull_request: branches: - - "*" - - "*/*" + - "**" + - "!no-tests/**" jobs: direct-test: name: Test of Action-setup-swift @@ -25,7 +25,7 @@ jobs: - ubuntu-latest - macOS-latest swift-version: - - 5.1.1 + - 5.1.2 - DEVELOPMENT-SNAPSHOT-2019-10-21-a runs-on: ${{ matrix.os }} steps: diff --git a/.scripts/python_files/workflow_templates.py b/.scripts/python_files/workflow_templates.py index ca09c2fb..6cd72e2c 100644 --- a/.scripts/python_files/workflow_templates.py +++ b/.scripts/python_files/workflow_templates.py @@ -9,14 +9,15 @@ SCRIPTS_DIR = './.scripts' OS_LIST = ['ubuntu-latest', 'macOS-latest'] -SWIFT_VERSION_LIST = ['5.1.1', 'DEVELOPMENT-SNAPSHOT-2019-10-21-a'] +SWIFT_VERSION_LIST = ['5.1.2', 'DEVELOPMENT-SNAPSHOT-2019-10-21-a'] +EXCLUDING_BRANCHES = ['!no-tests/**'] __each_branch = { 'name': "Test for branch \"%s\"", 'on': { 'push': { 'branches': [], - 'tags': ['!*'] + 'tags': ['!**'] } }, 'jobs': { @@ -57,11 +58,11 @@ 'name': "Direct Test", 'on': { 'push': { - 'branches': ['*', '*/*'], - 'tags': ['!*'] + 'branches': ['**'] + EXCLUDING_BRANCHES, + 'tags': ['!**'] }, 'pull_request': { - 'branches': ['*', '*/*'] + 'branches': ['**'] + EXCLUDING_BRANCHES } }, 'jobs': { @@ -112,11 +113,11 @@ 'name': "Check commits", 'on': { 'push': { - 'branches': ['*', '*/*'], - 'tags': ['!*'] + 'branches': ['**'] + EXCLUDING_BRANCHES, + 'tags': ['!**'] }, 'pull_request': { - 'branches': ['*', '*/*'] + 'branches': ['**'] + EXCLUDING_BRANCHES, } }, 'jobs': { diff --git a/package-lock.json b/package-lock.json index 73c71c57..60445221 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Action-setup-swift", - "version": "1.0.5-dev", + "version": "1.0.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2379,9 +2379,9 @@ "dev": true }, "handlebars": { - "version": "4.4.5", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz", - "integrity": "sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", + "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -4927,9 +4927,9 @@ "dev": true }, "uglify-js": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.4.tgz", - "integrity": "sha512-9Yc2i881pF4BPGhjteCXQNaXx1DCwm3dtOyBaG2hitHjLWOczw/ki8vD1bqyT3u6K0Ms/FpCShkmfg+FtlOfYA==", + "version": "3.6.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz", + "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==", "dev": true, "optional": true, "requires": { diff --git a/package.json b/package.json index 32e1c62a..83f8d796 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Action-setup-swift", - "version": "1.0.5-dev", + "version": "1.0.5", "description": "Setting Swift up.", "main": "lib/main.js", "scripts": {