From 16ec5c6dd79e36338f2ef6c0d17e1c20f8806f72 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Sun, 20 Oct 2024 12:58:11 +0100 Subject: [PATCH 1/4] OMERO.web 5.27.2 --- omero-web/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omero-web/Chart.yaml b/omero-web/Chart.yaml index cd4c399..9f8a49a 100644 --- a/omero-web/Chart.yaml +++ b/omero-web/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: 5.27.0 +appVersion: 5.27.2 description: OMERO.web name: omero-web -version: 0.4.5 +version: 0.4.6 icon: https://www.openmicroscopy.org/img/logos/omero-logomark.svg From 260f380cd4a26090f5b83d5c6feaff082501bbaa Mon Sep 17 00:00:00 2001 From: Simon Li Date: Sun, 20 Oct 2024 13:00:26 +0100 Subject: [PATCH 2/4] OMERO.server 5.6.13 --- omero-server/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omero-server/Chart.yaml b/omero-server/Chart.yaml index f128304..da33161 100644 --- a/omero-server/Chart.yaml +++ b/omero-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: 5.6.12 +appVersion: 5.6.13 description: OMERO.server name: omero-server -version: 0.4.6 +version: 0.4.7 icon: https://www.openmicroscopy.org/img/logos/omero-logomark.svg From d98e702ad7c364d9c92d8a0e3b6c98ba6bd07e71 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Sun, 20 Oct 2024 13:13:16 +0100 Subject: [PATCH 3/4] Update pre-commit --- .github/workflows/test_and_publish.yml | 2 +- .pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_and_publish.yml b/.github/workflows/test_and_publish.yml index 4846279..faffa68 100644 --- a/.github/workflows/test_and_publish.yml +++ b/.github/workflows/test_and_publish.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 - - uses: pre-commit/action@v3.0.0 + - uses: pre-commit/action@v3.0.1 test_omero: runs-on: ubuntu-22.04 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b229416..ca7f6dc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 24.1.1 + rev: 24.10.0 hooks: - id: black args: [--target-version=py36] From 184bc1989c3b73624b18f88292e1213e90a7265c Mon Sep 17 00:00:00 2001 From: Simon Li Date: Sun, 20 Oct 2024 13:16:33 +0100 Subject: [PATCH 4/4] K3s 1.31.1, Helm 3.16.2 --- .github/workflows/test_and_publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_and_publish.yml b/.github/workflows/test_and_publish.yml index faffa68..7ed52e7 100644 --- a/.github/workflows/test_and_publish.yml +++ b/.github/workflows/test_and_publish.yml @@ -27,8 +27,8 @@ jobs: helm-version: v3.5.4 # v4 supports k3s 1.24+ k3s-helm-version: v3 - - k3s-version: v1.30.3+k3s1 - helm-version: v3.15.3 + - k3s-version: v1.31.1+k3s1 + helm-version: v3.16.2 steps: - uses: actions/checkout@v4 with: @@ -96,9 +96,9 @@ jobs: cache: pip cache-dependency-path: dev-requirements.txt - - uses: azure/setup-helm@v3 + - uses: azure/setup-helm@v4 with: - version: v3.14.0 + version: v3.16.2 - name: Install dependencies run: pip install -r dev-requirements.txt