From a9ab4eb972481df68d3ebc5a3f7acb7cf9a8a8b6 Mon Sep 17 00:00:00 2001 From: europanite Date: Sat, 16 May 2026 06:05:42 +0900 Subject: [PATCH 1/6] fix/update/cicd --- .github/workflows/ci.yml | 13 ++++++------- .github/workflows/codeql.yml | 4 +--- .github/workflows/lint.yml | 9 ++++----- .github/workflows/pytest.yml | 11 +++++------ 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d723ff5..2be849f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,7 @@ on: push: pull_request: workflow_dispatch: - schedule: - - cron: '0 0 * * *' + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -21,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Build service TEST image env: DOCKER_BUILDKIT: 1 @@ -33,7 +32,7 @@ jobs: - name: Save images for downstream jobs run: | docker save local/service-test:ci | gzip > service-test.tar.gz - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v6 with: name: test-images path: service-test.tar.gz @@ -48,8 +47,8 @@ jobs: os: [ ubuntu-latest ] needs: build-test-images steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - uses: actions/checkout@v5 + - uses: actions/download-artifact@v6 with: name: test-images - name: Load images @@ -63,7 +62,7 @@ jobs: python -m coverage run -m pytest ' - name: Upload coverage xml - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: coverage-xml path: service/reports/ci/coverage.xml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2dfd3a2..c42f4da 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -16,8 +16,6 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] - schedule: - - cron: '0 0 * * *' jobs: analyze: @@ -57,7 +55,7 @@ jobs: # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 # Add any setup steps before running the `github/codeql-action/init` action. # This includes steps like installing compilers or runtimes (`actions/setup-node` diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 46320c1..4e9d281 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,8 +3,7 @@ on: push: workflow_dispatch: pull_request: - schedule: - - cron: '0 0 * * *' + permissions: security-events: write jobs: @@ -15,11 +14,11 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, windows-latest ] - python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" , "3.14" , "3.15" ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} cache: "pip" diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 7e309bd..9fc706d 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -3,8 +3,7 @@ on: push: pull_request: workflow_dispatch: - schedule: - - cron: '0 0 * * *' + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -19,16 +18,16 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, windows-latest ] - python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" , "3.14" , "3.15" ] env: PYTHONUTF8: "1" PYTHONPATH: ${{ github.workspace }}/service steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} cache: "pip" @@ -71,7 +70,7 @@ jobs: python -m coverage run -m pytest -q python -m coverage xml -o coverage.xml - name: Upload coverage.xml - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: coverage-${{ matrix.os }}-py${{ matrix.python-version }} path: coverage.xml From 973e3031f3b9e43a33745cc4200709d6716fc538 Mon Sep 17 00:00:00 2001 From: europanite Date: Sat, 16 May 2026 06:15:42 +0900 Subject: [PATCH 2/6] fix/update/cicd --- .github/workflows/ci.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/pytest.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2be849f..0c762ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest, macos-latest, windows-latest] needs: build-test-images steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4e9d281..a5d6910 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,8 +13,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] - python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" , "3.14" , "3.15" ] + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" , "3.14" ] steps: - uses: actions/checkout@v6 - name: Setup Python diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 9fc706d..59e59d6 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -17,8 +17,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] - python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" , "3.14" , "3.15" ] + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" , "3.14" ] env: PYTHONUTF8: "1" PYTHONPATH: ${{ github.workspace }}/service From 18f91dd82e17c5c7659a3bcd4620f639ab2c324a Mon Sep 17 00:00:00 2001 From: europanite Date: Sat, 16 May 2026 06:42:50 +0900 Subject: [PATCH 3/6] fix/update/cicd --- .github/workflows/pytest.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 59e59d6..b4bffea 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -32,15 +32,15 @@ jobs: python-version: ${{ matrix.python-version }} cache: "pip" - - name: Install deps (Ubuntu) - if: matrix.os == 'ubuntu-latest' + - name: Install deps (Unix) + if: matrix.os != 'windows-latest' shell: bash run: | set -eux python -m pip install -U pip - pip install -r service/requirements.test.txt + python -m pip install -r service/requirements.test.txt if [ -f service/pyproject.toml ] || [ -f service/setup.cfg ] || [ -f service/setup.py ]; then - pip install -e service + python -m pip install -e service fi - name: Install deps (Windows) if: matrix.os == 'windows-latest' @@ -48,7 +48,7 @@ jobs: run: | $ErrorActionPreference = "Stop" python -m pip install -U pip - pip install -r service/requirements.test.txt + python -m pip install -r service/requirements.test.txt $hasPythonProject = (Test-Path -Path 'service/pyproject.toml') -or (Test-Path -Path 'service/setup.cfg') -or (Test-Path -Path 'service/setup.py') @@ -62,7 +62,7 @@ jobs: run: | python --version pip --version - pytest --version + python -m pytest --version python -c "import sys,platform,os;print(platform.platform());print(sys.version);print('PYTHONPATH=',os.environ.get('PYTHONPATH'))" - name: Run tests with coverage shell: bash From 1d8129409e15572718558bba7b146279bf1bf519 Mon Sep 17 00:00:00 2001 From: europanite Date: Sat, 16 May 2026 06:48:12 +0900 Subject: [PATCH 4/6] fix/update/cicd --- .github/workflows/lint.yml | 1 + .github/workflows/pytest.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a5d6910..0a27281 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,6 +22,7 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: "pip" + cache-dependency-path: service/requirements.test.txt - name: Install tools run: | python -m pip install -U pip diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index b4bffea..cc80384 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -31,6 +31,7 @@ jobs: with: python-version: ${{ matrix.python-version }} cache: "pip" + cache-dependency-path: service/requirements.test.txt - name: Install deps (Unix) if: matrix.os != 'windows-latest' From 0a6eb4a2d6c130b0b9858851753d007b078b9d92 Mon Sep 17 00:00:00 2001 From: europanite Date: Sat, 16 May 2026 06:54:59 +0900 Subject: [PATCH 5/6] fix/update/cicd --- .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 0c762ff..7219ce3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest] needs: build-test-images steps: - uses: actions/checkout@v5 From faad7020f3f68c4f1d0ed8527babe7caf4428c44 Mon Sep 17 00:00:00 2001 From: europanite Date: Sat, 16 May 2026 06:59:01 +0900 Subject: [PATCH 6/6] fix/update/cicd --- .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 7219ce3..28964c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: matrix: os: [ ubuntu-latest ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v4 - name: Build service TEST image @@ -47,7 +47,7 @@ jobs: os: [ubuntu-latest] needs: build-test-images steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: actions/download-artifact@v6 with: name: test-images