From 51540e44337e44c4d88b46b221a2e92093052f7c Mon Sep 17 00:00:00 2001 From: "copier-update[bot]" Date: Sun, 9 Aug 2026 05:46:25 +0000 Subject: [PATCH 1/2] Update from Copier (2026-08-09T05-46-20Z) Signed-off-by: copier-update[bot] --- .copier-answers.yml | 2 +- .github/workflows/build.yaml | 57 +++++++++++++++++++++++++++++++++++ .github/workflows/copier.yaml | 18 ----------- 3 files changed, 58 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/copier.yaml diff --git a/.copier-answers.yml b/.copier-answers.yml index 1f9c0b1..741bbde 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: b2cdb6d +_commit: 84508d6 _src_path: https://github.com/python-project-templates/base.git add_docs: false add_extension: python diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 198b0f7..fe8e8ac 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,6 +19,7 @@ permissions: jobs: build: +<<<<<<< before updating runs-on: ${{ matrix.os }} strategy: matrix: @@ -30,6 +31,10 @@ jobs: - "3.11" cibuildwheel: - "cp311" +======= + runs-on: ubuntu-latest + +>>>>>>> after updating steps: - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -40,6 +45,7 @@ jobs: - name: Setup cache (mac/linux) uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: +<<<<<<< before updating path: "/home/runner/work/verible-python/verible-python/.ccache" key: cache-${{ runner.os }}- restore-keys: cache-${{ runner.os }}- @@ -55,6 +61,52 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 +======= + version: "3.11" + + - name: Install dependencies + run: make develop + + - name: Lint + run: make lint + + - name: Checks + run: make checks + + - name: Build + run: make build + + - name: Test + run: make coverage + + - name: Upload test results (Python) + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: test-results + path: junit.xml + if: always() + + - name: Publish test results + uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0 + with: + files: '**/junit.xml' + + - name: Upload coverage + uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 + with: + token: ${{ secrets.CODECOV_TOKEN }} + + - name: Build distributions + run: make dist + + - name: Test wheel + uses: actions-ext/python/test-wheel@6e1b91a408ea89f49bc8aff8724f83826f7b5446 + with: + module: verible + + - name: Test source distribution + uses: actions-ext/python/test-sdist@6e1b91a408ea89f49bc8aff8724f83826f7b5446 +>>>>>>> after updating with: python-version: ${{ matrix.python-version }} cache: 'pip' @@ -88,6 +140,7 @@ jobs: - name: Upload Wheel uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: +<<<<<<< before updating name: dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }} path: dist/*.whl @@ -104,3 +157,7 @@ jobs: - name: Test Wheel run: python -m pytest -vvv verible/tests +======= + name: dist + path: dist +>>>>>>> after updating diff --git a/.github/workflows/copier.yaml b/.github/workflows/copier.yaml deleted file mode 100644 index 7171411..0000000 --- a/.github/workflows/copier.yaml +++ /dev/null @@ -1,18 +0,0 @@ -name: Copier Updates - -on: - workflow_dispatch: - schedule: - - cron: "0 5 * * 0" - -jobs: - update: - permissions: - contents: write - pull-requests: write - runs-on: ubuntu-latest - steps: - - name: Update from Copier - uses: actions-ext/copier/update@2061209faa6b75ffd4fcecc0b0983772767997f4 - with: - token: ${{ secrets.WORKFLOW_TOKEN }} From ab3002532e1eab8af5901463437ac04fb9e0daf9 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 9 Aug 2026 10:39:27 -0400 Subject: [PATCH 2/2] Resolve Copier workflow conflicts Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com> --- .github/workflows/build.yaml | 57 ------------------------------------ 1 file changed, 57 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fe8e8ac..198b0f7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,7 +19,6 @@ permissions: jobs: build: -<<<<<<< before updating runs-on: ${{ matrix.os }} strategy: matrix: @@ -31,10 +30,6 @@ jobs: - "3.11" cibuildwheel: - "cp311" -======= - runs-on: ubuntu-latest - ->>>>>>> after updating steps: - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 @@ -45,7 +40,6 @@ jobs: - name: Setup cache (mac/linux) uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0 with: -<<<<<<< before updating path: "/home/runner/work/verible-python/verible-python/.ccache" key: cache-${{ runner.os }}- restore-keys: cache-${{ runner.os }}- @@ -61,52 +55,6 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0 -======= - version: "3.11" - - - name: Install dependencies - run: make develop - - - name: Lint - run: make lint - - - name: Checks - run: make checks - - - name: Build - run: make build - - - name: Test - run: make coverage - - - name: Upload test results (Python) - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 - with: - name: test-results - path: junit.xml - if: always() - - - name: Publish test results - uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0 - with: - files: '**/junit.xml' - - - name: Upload coverage - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 - with: - token: ${{ secrets.CODECOV_TOKEN }} - - - name: Build distributions - run: make dist - - - name: Test wheel - uses: actions-ext/python/test-wheel@6e1b91a408ea89f49bc8aff8724f83826f7b5446 - with: - module: verible - - - name: Test source distribution - uses: actions-ext/python/test-sdist@6e1b91a408ea89f49bc8aff8724f83826f7b5446 ->>>>>>> after updating with: python-version: ${{ matrix.python-version }} cache: 'pip' @@ -140,7 +88,6 @@ jobs: - name: Upload Wheel uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: -<<<<<<< before updating name: dist-${{ runner.os }}-${{ runner.arch }}-${{ matrix.python-version }} path: dist/*.whl @@ -157,7 +104,3 @@ jobs: - name: Test Wheel run: python -m pytest -vvv verible/tests -======= - name: dist - path: dist ->>>>>>> after updating