From 1f3954e2a33f06da3c95605fb20733e756c9313b Mon Sep 17 00:00:00 2001 From: "Paulo F. Oliveira" Date: Wed, 31 Mar 2021 19:18:27 +0100 Subject: [PATCH] Reduce size of dist (#26) --- .github/{elixir.json => elixir-matchers.json} | 0 .gitignore | 1 + MATCHER_NOTICE.md | 5 +- README.md | 4 +- .../{elixir.json => elixir-matchers.json} | 0 dist/.github/workflows/ci.yml | 32 ----- dist/.github/workflows/test.yml | 119 ------------------ dist/index.js | 4 +- src/setup-beam.js | 4 +- 9 files changed, 12 insertions(+), 157 deletions(-) rename .github/{elixir.json => elixir-matchers.json} (100%) rename dist/.github/{elixir.json => elixir-matchers.json} (100%) delete mode 100644 dist/.github/workflows/ci.yml delete mode 100644 dist/.github/workflows/test.yml diff --git a/.github/elixir.json b/.github/elixir-matchers.json similarity index 100% rename from .github/elixir.json rename to .github/elixir-matchers.json diff --git a/.gitignore b/.gitignore index a860310..f445c78 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ node_modules/** +dist/.github/workflows diff --git a/MATCHER_NOTICE.md b/MATCHER_NOTICE.md index 08466c9..ab9ac8a 100644 --- a/MATCHER_NOTICE.md +++ b/MATCHER_NOTICE.md @@ -1,6 +1,7 @@ -# Matchers +# Elixir Problem Matchers -Problem matchers in [elixir.json](.github/elixir.json) are adapted from [here](https://github.com/fr1zle/vscode-elixir/blob/45eddb589acd7ac98e0c7305d1c2b24668ca709a/package.json#L70-L118), +Elixir Problem Matchers in [elixir-matchers.json](.github/elixir-matchers.json) +are adapted from [here](https://github.com/fr1zle/vscode-elixir/blob/45eddb589acd7ac98e0c7305d1c2b24668ca709a/package.json#L70-L118), available under the [MIT license](https://github.com/fr1zle/vscode-elixir/blob/45eddb589acd7ac98e0c7305d1c2b24668ca709a/LICENSE.md): MIT License diff --git a/README.md b/README.md index 79c870f..69d05fa 100644 --- a/README.md +++ b/README.md @@ -174,9 +174,9 @@ if System.get_env("GITHUB_ACTIONS") do end ``` -## Matchers +## Elixir Problem Matchers -The problem matchers in this repository are adapted from [here](https://github.com/fr1zle/vscode-elixir/blob/45eddb589acd7ac98e0c7305d1c2b24668ca709a/package.json#L70-L118). See [MATCHER_NOTICE](MATCHER_NOTICE.md) for license details. +The Elixir Problem Matchers in this repository are adapted from [here](https://github.com/fr1zle/vscode-elixir/blob/45eddb589acd7ac98e0c7305d1c2b24668ca709a/package.json#L70-L118). See [MATCHER_NOTICE](MATCHER_NOTICE.md) for license details. ## License diff --git a/dist/.github/elixir.json b/dist/.github/elixir-matchers.json similarity index 100% rename from dist/.github/elixir.json rename to dist/.github/elixir-matchers.json diff --git a/dist/.github/workflows/ci.yml b/dist/.github/workflows/ci.yml deleted file mode 100644 index 7253b21..0000000 --- a/dist/.github/workflows/ci.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: ci - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - check_integrity: - name: Make sure expected pre-release actions are performed - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: '12' - - run: npm install -g npm - - run: npm install - - run: npm run format - - run: npm install -g markdownlint-cli - - run: npm run markdownlint - - run: npm run shellcheck - - run: npm run yamllint - - run: npm run jslint - - run: npm run licenses - - run: npm run build - - name: Check if build left artifacts - run: git diff --exit-code diff --git a/dist/.github/workflows/test.yml b/dist/.github/workflows/test.yml deleted file mode 100644 index 55b4057..0000000 --- a/dist/.github/workflows/test.yml +++ /dev/null @@ -1,119 +0,0 @@ ---- -name: test - -on: - push: {branches: main} - pull_request: {branches: main} - repository_dispatch: - workflow_dispatch: - -jobs: - unit_test: - name: Pre-release unit tests - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: {node-version: '12'} - - run: npm ci - - run: npm test - - integration_test: - name: > - Pre-release integration tests - (Erlang/OTP ${{matrix.pair.otp-version}}, - Elixir ${{matrix.pair.elixir-version}}, - rebar3 ${{matrix.pair.rebar3-version}}) - runs-on: ubuntu-18.04 - strategy: - fail-fast: false - matrix: - pair: - # Full Versions - - otp-version: '22.0' - elixir-version: '1.9.1' - - otp-version: '22.3.4' - rebar3-version: '3.14.4' - # Semver ranges - - otp-version: '21.x' - elixir-version: '<1.9.1' - - otp-version: '21.x' - rebar3-version: '3.14.4' - # Branches - - otp-version: '22.0' - elixir-version: master - - otp-version: 'master' - elixir-version: '1.11.3' - # Pre-releases - - otp-version: '23.0' - elixir-version: '1.11.0-rc.0' - # Fallback to Elixir (with no OTP) - - otp-version: '24.0-rc1' - elixir-version: '1.9.3' - # Miscellaneous combos - - elixir-version: 'master' - otp-version: '22.3' - - elixir-version: 'master' - otp-version: '22' - - elixir-version: 'master' - otp-version: '^22' - - elixir-version: 'master' - otp-version: '22' - - elixir-version: '1.6.5' - otp-version: 'maint-21' - - elixir-version: 'v1.6.5' - otp-version: 'maint-21' - - elixir-version: 'v1.9.x' - otp-version: '21.1' - - elixir-version: '1.9.x' - otp-version: '21' - - elixir-version: 'v1.8.x' - otp-version: '22' - - elixir-version: 'v1.8.x' - otp-version: '23.1' - - elixir-version: 'v1.8' - otp-version: '^22.3' - - elixir-version: 'v1.10' - otp-version: '21.x' - - elixir-version: 'v1.x' - otp-version: 'master' - - elixir-version: 'v1.11.0-rc.0' - otp-version: '23' - - elixir-version: 'v1.11.0-rc.0' - otp-version: '23.0' - - elixir-version: 'v1.11.0-rc.0' - otp-version: 'master' - steps: - - uses: actions/checkout@v2 - - name: Use erlef/setup-beam - id: setup-beam - uses: ./ - with: - otp-version: ${{matrix.pair.otp-version}} - elixir-version: ${{matrix.pair.elixir-version}} - rebar3-version: ${{matrix.pair.rebar3-version}} - - name: Erlang/OTP version (action) - run: echo "Erlang/OTP ${{steps.setup-beam.outputs.otp-version}}" - - name: Elixir version (action) - run: echo "Elixir ${{steps.setup-beam.outputs.elixir-version}}" - if: ${{matrix.pair.elixir-version}} - - name: rebar3 version (action) - run: echo "rebar3 ${{steps.setup-beam.outputs.rebar3-version}}" - if: ${{matrix.pair.rebar3-version}} - - name: mix version and help (CLI) - run: | - mix -v - mix help local.rebar - mix help local.hex - if: ${{matrix.pair.elixir-version}} - - name: Run Mix project tests - run: | - cd test-projects/mix - mix deps.get - mix test - if: ${{matrix.pair.elixir-version}} - - name: Run rebar3 project tests - run: | - cd test-projects/rebar3 - rebar3 as test do xref,dialyzer,ct,cover - if: ${{matrix.pair.rebar3-version}} diff --git a/dist/index.js b/dist/index.js index 7083ce1..d876a23 100644 --- a/dist/index.js +++ b/dist/index.js @@ -4660,7 +4660,9 @@ async function maybeInstallElixir(elixirSpec, otpVersion) { await installer.installElixir(elixirVersion) core.setOutput('elixir-version', elixirVersion) const matchersPath = __nccwpck_require__.ab + ".github" - console.log(`##[add-matcher]${path.join(matchersPath, 'elixir.json')}`) + console.log( + `##[add-matcher]${path.join(matchersPath, 'elixir-matchers.json')}`, + ) prependToPath(`${process.env.RUNNER_TEMP}/.setup-beam/elixir/bin`) console.log('##[endgroup]') diff --git a/src/setup-beam.js b/src/setup-beam.js index 2b422c6..d4d41c4 100644 --- a/src/setup-beam.js +++ b/src/setup-beam.js @@ -53,7 +53,9 @@ async function maybeInstallElixir(elixirSpec, otpVersion) { await installer.installElixir(elixirVersion) core.setOutput('elixir-version', elixirVersion) const matchersPath = path.join(__dirname, '..', '.github') - console.log(`##[add-matcher]${path.join(matchersPath, 'elixir.json')}`) + console.log( + `##[add-matcher]${path.join(matchersPath, 'elixir-matchers.json')}`, + ) prependToPath(`${process.env.RUNNER_TEMP}/.setup-beam/elixir/bin`) console.log('##[endgroup]')