diff --git a/dist/.github/matchers.json b/dist/.github/matchers.json deleted file mode 100644 index ee4c9a9c..00000000 --- a/dist/.github/matchers.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "problemMatcher": [ - { - "owner": "tflint-compact", - "pattern": [ - { - "regexp": "^(.+):(\\d+):(\\d+):\\s(Error|Warning|Notice)\\s-\\s(.+)\\s\\((.+)\\)$", - "file": 1, - "line": 2, - "column": 3, - "severity": 4, - "message": 5, - "code": 6 - } - ] - } - ] -} diff --git a/dist/.github/workflows/dist.yml b/dist/.github/workflows/dist.yml deleted file mode 100644 index 9ebaedbd..00000000 --- a/dist/.github/workflows/dist.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Build -on: - push: - branches: - - master - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - - uses: actions/cache@v2 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - name: Install - run: npm ci - - name: Test - run: npm test - - name: Build - run: npm run build - - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: update dist - file_pattern: dist/*.js diff --git a/dist/.github/workflows/semver.yml b/dist/.github/workflows/semver.yml deleted file mode 100644 index 875065ea..00000000 --- a/dist/.github/workflows/semver.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Update semver tags -on: - push: - branches-ignore: - - '**' - tags: - - 'v*.*.*' -jobs: - semver: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: haya14busa/action-update-semver@v1 diff --git a/dist/.github/workflows/test.yml b/dist/.github/workflows/test.yml deleted file mode 100644 index dc0c0730..00000000 --- a/dist/.github/workflows/test.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: Test - -on: - push: - branches: - - master - pull_request: - -jobs: - build: - name: Build checks - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - - uses: actions/cache@v3 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - name: Install - run: npm ci - - name: Build & Verify - run: npm run build && git diff --exit-code - - unit: - name: Unit tests - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - - uses: actions/cache@v3 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - name: Install - run: npm ci - - name: Test - run: npm test - - integration: - name: Integration test - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Use Action - uses: ./ - - name: Validate - run: tflint -v - - integration-versions: - name: 'Integration test (tflint_version: ${{ matrix.tflint_version }})' - runs-on: ubuntu-latest - strategy: - matrix: - tflint_version: ['v0.24.1', latest] - - steps: - - uses: actions/checkout@v3 - - name: Use Action - uses: ./ - with: - tflint_version: ${{ matrix.tflint_version }} - - name: Validate - if: matrix.tflint_version != 'latest' - run: |- - version='${{ matrix.tflint_version }}' - tflint -v | grep ${version:1} - - name: Validate - if: matrix.tflint_version == 'latest' - run: tflint -v - - integration-matchers: - name: 'Integration test (tflint_version: ${{ matrix.tflint_version }})' - runs-on: ubuntu-latest - strategy: - matrix: - tflint_version: ['v0.26.0', latest] - - steps: - - uses: actions/checkout@v3 - - name: Use Action - uses: ./ - with: - tflint_version: ${{ matrix.tflint_version }} - - name: Run - run: tflint -f compact --force diff --git a/dist/index.js b/dist/index.js index 922c4597..009a52c7 100644 --- a/dist/index.js +++ b/dist/index.js @@ -9376,8 +9376,8 @@ async function run() { core.addPath(pathToCLI); - const matchersPath = __nccwpck_require__.ab + ".github"; - core.info(`##[add-matcher]${path.join(matchersPath, 'matchers.json')}`); + const matchersPath = __nccwpck_require__.ab + "matchers.json"; + core.info(`##[add-matcher]${matchersPath}`); return version; } catch (ex) { diff --git a/src/setup-tflint.js b/src/setup-tflint.js index 4bc391eb..eb136ba3 100644 --- a/src/setup-tflint.js +++ b/src/setup-tflint.js @@ -85,8 +85,8 @@ async function run() { core.addPath(pathToCLI); - const matchersPath = path.join(__dirname, '..', '.github'); - core.info(`##[add-matcher]${path.join(matchersPath, 'matchers.json')}`); + const matchersPath = path.join(__dirname, '..', '.github', 'matchers.json'); + core.info(`##[add-matcher]${matchersPath}`); return version; } catch (ex) {