From 9089667f1cab84ec9e1152681797668523e94d34 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 20:38:47 +0900 Subject: [PATCH 01/21] chore: add octocov.yml --- .octocov.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .octocov.yml diff --git a/.octocov.yml b/.octocov.yml new file mode 100644 index 0000000..b386bc1 --- /dev/null +++ b/.octocov.yml @@ -0,0 +1,16 @@ +# generated by octocov init +coverage: + if: true +testExecutionTime: + if: true +diff: + datastores: + - artifact://${GITHUB_REPOSITORY} +comment: + if: is_pull_request +summary: + if: true +report: + if: is_default_branch + datastores: + - artifact://${GITHUB_REPOSITORY} From f8cf4be25561ae5a6424af1d41ea9ad2be30a9f5 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 21:01:57 +0900 Subject: [PATCH 02/21] chore: add aqua.yml --- aqua.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 aqua.yaml diff --git a/aqua.yaml b/aqua.yaml new file mode 100644 index 0000000..36dece4 --- /dev/null +++ b/aqua.yaml @@ -0,0 +1,15 @@ +--- +# aqua - Declarative CLI Version Manager +# https://aquaproj.github.io/ +# checksum: +# enabled: true +# require_checksum: true +# supported_envs: +# - all +registries: +- type: standard + ref: v4.188.0 # renovate: depName=aquaproj/aqua-registry +packages: +- name: k1LoW/octocov@v0.60.0 +- name: astral-sh/rye@0.34.0 +- name: astral-sh/uv@0.2.5 From 95501a27d479b7bf3fed6e300d11df99b86bc62d Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 21:02:25 +0900 Subject: [PATCH 03/21] chore: add rye confnigs --- .python-version | 1 + pyproject.toml | 26 ++++++++++++++++++++++++++ requirements-dev.lock | 18 ++++++++++++++++++ requirements.lock | 11 +++++++++++ 4 files changed, 56 insertions(+) create mode 100644 .python-version create mode 100644 pyproject.toml create mode 100644 requirements-dev.lock create mode 100644 requirements.lock diff --git a/.python-version b/.python-version new file mode 100644 index 0000000..871f80a --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.12.3 diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..ba023af --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,26 @@ +[project] +name = "vim-textobj-bettertag" +version = "0.1.0" +description = "Add your description here" +authors = [ + { name = "Omochice", email = "mochice.mls.ntl@gmail.com" } +] +dependencies = [] +readme = "README.md" +requires-python = ">= 3.12" + +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[tool.rye] +managed = true +dev-dependencies = [ + "covimerage>=0.2.2", +] + +[tool.hatch.metadata] +allow-direct-references = true + +[tool.hatch.build.targets.wheel] +packages = ["src/vim_textobj_bettertag"] diff --git a/requirements-dev.lock b/requirements-dev.lock new file mode 100644 index 0000000..7e9e715 --- /dev/null +++ b/requirements-dev.lock @@ -0,0 +1,18 @@ +# generated by rye +# use `rye lock` or `rye sync` to update this lockfile +# +# last locked with the following flags: +# pre: false +# features: [] +# all-features: false +# with-sources: false +# generate-hashes: false + +-e file:. +attrs==23.2.0 + # via covimerage +click==7.0 + # via covimerage +coverage==4.5.4 + # via covimerage +covimerage==0.2.2 diff --git a/requirements.lock b/requirements.lock new file mode 100644 index 0000000..d795436 --- /dev/null +++ b/requirements.lock @@ -0,0 +1,11 @@ +# generated by rye +# use `rye lock` or `rye sync` to update this lockfile +# +# last locked with the following flags: +# pre: false +# features: [] +# all-features: false +# with-sources: false +# generate-hashes: false + +-e file:. From cc2c07962ef4c037eab06c074ffa84dcff9e2841 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 21:02:33 +0900 Subject: [PATCH 04/21] ci: use aqua instead --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d5dfe4..0ac44b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,17 +37,16 @@ jobs: THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.neovim }}-${{ matrix.version }}.txt run: | ${GITHUB_WORKSPACE}/vim-themis/bin/themis --reporter dot - - name: setup python - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 + - uses: aquaproj/aqua-installer@6ce1f8848ec8e61f14d57bd5d7597057a6dd187c # v3.0.1 with: - python-version: '3.10' + aqua_version: v2.28.1 - name: collect coverage env: THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.neovim }}-${{ matrix.version }}.txt run: | - pip install covimerage - covimerage write_coverage "${THEMIS_PROFILE}" - covimerage xml + rye sync + rye run covimerage write_coverage "${THEMIS_PROFILE}" + rye run covimerage xml - uses: k1LoW/octocov-action@5213913fe329368ab9dafa16f18f4f3cce1062f0 # v1.3.0 - name: create filename id: filename From d0e437112bab2b1b65ecaf1fd9be95dfbb25b297 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 21:06:04 +0900 Subject: [PATCH 05/21] Revert "chore: add rye confnigs" This reverts commit 95501a27d479b7bf3fed6e300d11df99b86bc62d. --- .python-version | 1 - pyproject.toml | 26 -------------------------- requirements-dev.lock | 18 ------------------ requirements.lock | 11 ----------- 4 files changed, 56 deletions(-) delete mode 100644 .python-version delete mode 100644 pyproject.toml delete mode 100644 requirements-dev.lock delete mode 100644 requirements.lock diff --git a/.python-version b/.python-version deleted file mode 100644 index 871f80a..0000000 --- a/.python-version +++ /dev/null @@ -1 +0,0 @@ -3.12.3 diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index ba023af..0000000 --- a/pyproject.toml +++ /dev/null @@ -1,26 +0,0 @@ -[project] -name = "vim-textobj-bettertag" -version = "0.1.0" -description = "Add your description here" -authors = [ - { name = "Omochice", email = "mochice.mls.ntl@gmail.com" } -] -dependencies = [] -readme = "README.md" -requires-python = ">= 3.12" - -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" - -[tool.rye] -managed = true -dev-dependencies = [ - "covimerage>=0.2.2", -] - -[tool.hatch.metadata] -allow-direct-references = true - -[tool.hatch.build.targets.wheel] -packages = ["src/vim_textobj_bettertag"] diff --git a/requirements-dev.lock b/requirements-dev.lock deleted file mode 100644 index 7e9e715..0000000 --- a/requirements-dev.lock +++ /dev/null @@ -1,18 +0,0 @@ -# generated by rye -# use `rye lock` or `rye sync` to update this lockfile -# -# last locked with the following flags: -# pre: false -# features: [] -# all-features: false -# with-sources: false -# generate-hashes: false - --e file:. -attrs==23.2.0 - # via covimerage -click==7.0 - # via covimerage -coverage==4.5.4 - # via covimerage -covimerage==0.2.2 diff --git a/requirements.lock b/requirements.lock deleted file mode 100644 index d795436..0000000 --- a/requirements.lock +++ /dev/null @@ -1,11 +0,0 @@ -# generated by rye -# use `rye lock` or `rye sync` to update this lockfile -# -# last locked with the following flags: -# pre: false -# features: [] -# all-features: false -# with-sources: false -# generate-hashes: false - --e file:. From d3e1d7c306d6bbc03616c30eed1f21adc41932e9 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 21:06:16 +0900 Subject: [PATCH 06/21] Revert "ci: use aqua instead" This reverts commit cc2c07962ef4c037eab06c074ffa84dcff9e2841. --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ac44b0..7d5dfe4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,16 +37,17 @@ jobs: THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.neovim }}-${{ matrix.version }}.txt run: | ${GITHUB_WORKSPACE}/vim-themis/bin/themis --reporter dot - - uses: aquaproj/aqua-installer@6ce1f8848ec8e61f14d57bd5d7597057a6dd187c # v3.0.1 + - name: setup python + uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: - aqua_version: v2.28.1 + python-version: '3.10' - name: collect coverage env: THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.neovim }}-${{ matrix.version }}.txt run: | - rye sync - rye run covimerage write_coverage "${THEMIS_PROFILE}" - rye run covimerage xml + pip install covimerage + covimerage write_coverage "${THEMIS_PROFILE}" + covimerage xml - uses: k1LoW/octocov-action@5213913fe329368ab9dafa16f18f4f3cce1062f0 # v1.3.0 - name: create filename id: filename From a058bcaba18e8395b98ac8deb8dd717336282105 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:08:17 +0900 Subject: [PATCH 07/21] ci --- .github/workflows/ci.yml | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d5dfe4..fe2e517 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,22 +45,48 @@ jobs: env: THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.neovim }}-${{ matrix.version }}.txt run: | - pip install covimerage + pip install covimerage=0.2.2 covimerage write_coverage "${THEMIS_PROFILE}" covimerage xml - uses: k1LoW/octocov-action@5213913fe329368ab9dafa16f18f4f3cce1062f0 # v1.3.0 - name: create filename id: filename - run: echo "filename=badge-${{ runner.os }}-$(test \"${{ matrix.neovim }}\" = \"true\" && echo neovim || echo vim )-${{ matrix.version }}" >> "$GITHUB_OUTPUT" + run: echo "filename=${{ runner.os }}-$(test \"${{ matrix.neovim }}\" = \"true\" && echo neovim || echo vim )-${{ matrix.version }}" >> "$GITHUB_OUTPUT" - name: make covarage badge run: | - octocov badge coverage --out ${{ github.workspace }}/${{ steps.filename.outputs.filename }}.svg + octocov badge coverage --out ${{ github.workspace }}/badge-${{ steps.filename.outputs.filename }}.svg - name: upload badge to artifact uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: - path: ${{ steps.filename.outputs.filename }}.svg - name: ${{ steps.filename.outputs.filename }} + path: badge-${{ steps.filename.outputs.filename }}.svg + name: badge-${{ steps.filename.outputs.filename }} if-no-files-found: error + - name: rename coverage.xml + run: mv coverage.xml coverage-${{ steps.filename.outputs.filename }}.xml + - name: upload coverage to artifact + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + with: + path: coverage-${{ steps.filename.outputs.filename }}.xml + name: coverage-${{ steps.filename.outputs.filename }} + if-no-files-found: error + + report-coverage-metrics: + runs-on: ubuntu-latest + needs: themis + steps: + - name: download artifacts + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + with: + pattern: "coverage-*" + - name: extract + run: mv **/*.xml ./ + - name: Setup pnpm + uses: pnpm/action-setup@v4 + - name: merge coverage + run: pnpm dlx cobertura@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\\(\\(coverage\\)-\(.*\\)\\.xml$/\\3=\\1/g') + - name: show + run: cat coverage.xml + upload-coverage-badge: runs-on: ubuntu-latest From 067c9745174e3e36f8dde52e86a55d560031b8c9 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:09:14 +0900 Subject: [PATCH 08/21] ci: use == --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe2e517..1ea9b92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: env: THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.neovim }}-${{ matrix.version }}.txt run: | - pip install covimerage=0.2.2 + pip install covimerage==0.2.2 covimerage write_coverage "${THEMIS_PROFILE}" covimerage xml - uses: k1LoW/octocov-action@5213913fe329368ab9dafa16f18f4f3cce1062f0 # v1.3.0 From 2ada0955b22d9e047d05258c2e9e8516d218517e Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:13:35 +0900 Subject: [PATCH 09/21] ci: use latest --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ea9b92..3ce1a75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,6 +82,8 @@ jobs: run: mv **/*.xml ./ - name: Setup pnpm uses: pnpm/action-setup@v4 + with: + version: latest - name: merge coverage run: pnpm dlx cobertura@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\\(\\(coverage\\)-\(.*\\)\\.xml$/\\3=\\1/g') - name: show From 7affff0d5f80e887c926e903c8c03c165ecd1efa Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:17:24 +0900 Subject: [PATCH 10/21] ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ce1a75..c81f5c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,7 +85,7 @@ jobs: with: version: latest - name: merge coverage - run: pnpm dlx cobertura@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\\(\\(coverage\\)-\(.*\\)\\.xml$/\\3=\\1/g') + run: pnpm dlx cobertura@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\\(\\(coverage\\)-\\(.*\\)\\.xml$/\\3=\\1/g') - name: show run: cat coverage.xml From 70cfa53100eef25f22d8e0a303120bcbe38991ae Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:20:35 +0900 Subject: [PATCH 11/21] ci: commentout --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c81f5c5..4d2b4cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: pip install covimerage==0.2.2 covimerage write_coverage "${THEMIS_PROFILE}" covimerage xml - - uses: k1LoW/octocov-action@5213913fe329368ab9dafa16f18f4f3cce1062f0 # v1.3.0 + # - uses: k1LoW/octocov-action@5213913fe329368ab9dafa16f18f4f3cce1062f0 # v1.3.0 - name: create filename id: filename run: echo "filename=${{ runner.os }}-$(test \"${{ matrix.neovim }}\" = \"true\" && echo neovim || echo vim )-${{ matrix.version }}" >> "$GITHUB_OUTPUT" From a261238099089e605f086a354bf561d0a5690594 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:20:43 +0900 Subject: [PATCH 12/21] ci: fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d2b4cf..2bc8211 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,7 +85,7 @@ jobs: with: version: latest - name: merge coverage - run: pnpm dlx cobertura@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\\(\\(coverage\\)-\\(.*\\)\\.xml$/\\3=\\1/g') + run: pnpm dlx cobertura-merge@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\\(\\(coverage\\)-\\(.*\\)\\.xml$/\\3=\\1/g') - name: show run: cat coverage.xml From 599153483d1aa66f96307c797c8f576813912257 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:22:09 +0900 Subject: [PATCH 13/21] ci --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bc8211..c4826a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,6 @@ on: paths-ignore: - "README.md" - "doc/*.txt" - pull_request: jobs: themis: @@ -48,7 +47,6 @@ jobs: pip install covimerage==0.2.2 covimerage write_coverage "${THEMIS_PROFILE}" covimerage xml - # - uses: k1LoW/octocov-action@5213913fe329368ab9dafa16f18f4f3cce1062f0 # v1.3.0 - name: create filename id: filename run: echo "filename=${{ runner.os }}-$(test \"${{ matrix.neovim }}\" = \"true\" && echo neovim || echo vim )-${{ matrix.version }}" >> "$GITHUB_OUTPUT" From a9d3b1a4334e21ff6e9966ed4fb513c8dfb8f03e Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:23:04 +0900 Subject: [PATCH 14/21] ci: aqua --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4826a6..d675fd5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,9 @@ jobs: uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.10' + - uses: aquaproj/aqua-installer@6ce1f8848ec8e61f14d57bd5d7597057a6dd187c # v3.0.1 + with: + aqua_version: v2.28.1 - name: collect coverage env: THEMIS_PROFILE: ${{ github.workspace }}/vim-profile-${{ runner.os }}-${{ matrix.neovim }}-${{ matrix.version }}.txt From 24fa37a8a6dc8be086b244e74e7b04c84cc1ca07 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:26:29 +0900 Subject: [PATCH 15/21] ci: debug --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d675fd5..2cd3c03 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,9 @@ jobs: with: pattern: "coverage-*" - name: extract - run: mv **/*.xml ./ + run: | + mv **/*.xml ./ + tree - name: Setup pnpm uses: pnpm/action-setup@v4 with: From 4f949de90e0778c62ee12a84a50c4357f49360a5 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:30:34 +0900 Subject: [PATCH 16/21] ci --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2cd3c03..6e94be0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,6 +83,7 @@ jobs: run: | mv **/*.xml ./ tree + ls *.xml | sed 's/^\\(\\(coverage\\)-\\(.*\\)\\.xml$/\\3=\\1/g' - name: Setup pnpm uses: pnpm/action-setup@v4 with: From 91986913205c9aeafc2e02313e55980e4bd77c46 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:35:41 +0900 Subject: [PATCH 17/21] ci: test --- .github/workflows/test.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..c7b1128 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,11 @@ +name: GitHub Actions Demo + +on: + - push + +jobs: + Explore-GitHub-Actions: + runs-on: ubuntu-latest + steps: + - run: | + echo coverage-Linux-vim-stable.xml | sed 's/^\\(\\(coverage\\)-\\(.*\\)\\.xml$/\\3=\\1/g' From 258e50e04a5813174a6cc5d3273f364dfaac7665 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:43:51 +0900 Subject: [PATCH 18/21] Revert "ci: test" This reverts commit 91986913205c9aeafc2e02313e55980e4bd77c46. --- .github/workflows/test.yml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index c7b1128..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: GitHub Actions Demo - -on: - - push - -jobs: - Explore-GitHub-Actions: - runs-on: ubuntu-latest - steps: - - run: | - echo coverage-Linux-vim-stable.xml | sed 's/^\\(\\(coverage\\)-\\(.*\\)\\.xml$/\\3=\\1/g' From 687293c89e05a684f5e9119f75041bfb43686253 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:44:30 +0900 Subject: [PATCH 19/21] ci --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e94be0..75eb578 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,13 +83,13 @@ jobs: run: | mv **/*.xml ./ tree - ls *.xml | sed 's/^\\(\\(coverage\\)-\\(.*\\)\\.xml$/\\3=\\1/g' + ls *.xml | sed 's/^\(\(coverage\)-\(.*\)\.xml\)$/\3=\1/g' - name: Setup pnpm uses: pnpm/action-setup@v4 with: version: latest - name: merge coverage - run: pnpm dlx cobertura-merge@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\\(\\(coverage\\)-\\(.*\\)\\.xml$/\\3=\\1/g') + run: pnpm dlx cobertura-merge@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\(\(coverage\)-\(.*\)\.xml\)$/\3=\1/g') - name: show run: cat coverage.xml From 2f4fbf41c9cca9c4c2793239b5e64cc19e3a8f55 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:47:37 +0900 Subject: [PATCH 20/21] ci: --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75eb578..5d8a2e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: paths-ignore: - "README.md" - "doc/*.txt" + pull_request: jobs: themis: @@ -82,16 +83,13 @@ jobs: - name: extract run: | mv **/*.xml ./ - tree - ls *.xml | sed 's/^\(\(coverage\)-\(.*\)\.xml\)$/\3=\1/g' - name: Setup pnpm uses: pnpm/action-setup@v4 with: version: latest - name: merge coverage run: pnpm dlx cobertura-merge@1.0.4 -o coverage.xml $(ls *.xml | sed 's/^\(\(coverage\)-\(.*\)\.xml\)$/\3=\1/g') - - name: show - run: cat coverage.xml + - uses: k1LoW/octocov-action@v1 upload-coverage-badge: From e5d12b350afa33fb9ca42966d60eeb1071995000 Mon Sep 17 00:00:00 2001 From: Omochice Date: Mon, 3 Jun 2024 22:51:47 +0900 Subject: [PATCH 21/21] ci: checkout --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d8a2e6..ecfdac1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,6 +76,8 @@ jobs: runs-on: ubuntu-latest needs: themis steps: + - name: checkout + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: download artifacts uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: @@ -97,6 +99,8 @@ jobs: if: startsWith(github.ref, 'refs/heads/main') needs: themis steps: + - name: checkout + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: download artifacts uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: