From 2c6ee1ffa3da701f346a62109c7e28ce9c6be4b7 Mon Sep 17 00:00:00 2001 From: John Helmert III Date: Sun, 11 Dec 2022 14:31:13 -0600 Subject: [PATCH 1/4] drop source file with main() declaration Compiling this source file results in errors when cld3 is linked with other programs defining a main() function, such as Telegram. Gentoo-Bug: https://bugs.gentoo.org/883935 Signed-off-by: John Helmert III --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fa3908..246420c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,6 @@ add_library(${PROJECT_NAME} src/script_span/generated_entities.cc src/script_span/getonescriptspan.cc src/script_span/getonescriptspan.h - src/script_span/getonescriptspan_test.cc src/script_span/utf8statetable.cc src/script_span/offsetmap.cc src/script_span/text_processing.cc From ef49ca4e716bf45c2242518f1816fedf992ec746 Mon Sep 17 00:00:00 2001 From: John Helmert III Date: Sun, 11 Dec 2022 14:49:50 -0600 Subject: [PATCH 2/4] update actions versions Signed-off-by: John Helmert III --- .github/workflows/main.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b26ff5e..f93defb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: python-version: [3.6, 3.7, 3.8, pypy3] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Linux Dependencies if: runner.os == 'Linux' @@ -24,7 +24,7 @@ jobs: run: brew install protobuf - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} @@ -48,9 +48,9 @@ jobs: name: Build source distribution runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 name: Install Python with: python-version: "3.8" @@ -62,7 +62,7 @@ jobs: - name: Build sdist run: python setup.py sdist - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: path: dist/*.tar.gz @@ -79,14 +79,14 @@ jobs: arch: aarch64 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up QEMU if: ${{ matrix.arch == 'aarch64' }} - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2 - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: 3.8 @@ -106,7 +106,7 @@ jobs: run: | python -m cibuildwheel --output-dir wheelhouse - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: path: ./wheelhouse/*.whl @@ -119,13 +119,13 @@ jobs: # alternatively, to publish when a GitHub Release is created, use the following rule: # if: github.event_name == 'release' && github.event.action == 'published' steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: artifact path: dist - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: '3.8' From 0275c467ced7e42103223af16c7da9b55a4c085d Mon Sep 17 00:00:00 2001 From: John Helmert III Date: Sun, 11 Dec 2022 14:52:31 -0600 Subject: [PATCH 3/4] github actions: pypy3 -> pypy-3.8 Signed-off-by: John Helmert III --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f93defb..41125f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.6, 3.7, 3.8, pypy3] + python-version: [3.6, 3.7, 3.8, pypy-3.8] steps: - uses: actions/checkout@v3 From da0b56a80b1e0a309ff20103efe0161adb9bd275 Mon Sep 17 00:00:00 2001 From: John Helmert III Date: Sun, 11 Dec 2022 17:39:19 -0600 Subject: [PATCH 4/4] github actions: drop 3.6 Signed-off-by: John Helmert III --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 41125f8..1c08f1b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.6, 3.7, 3.8, pypy-3.8] + python-version: [3.7, 3.8, pypy-3.8] steps: - uses: actions/checkout@v3