From cff035bd9b1dccb498162da14b72bc05ef44e9ff Mon Sep 17 00:00:00 2001 From: Keith Suderman Date: Wed, 11 Oct 2023 10:35:55 -0400 Subject: [PATCH 1/8] Update app version to 23.1 --- galaxy/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy/Chart.yaml b/galaxy/Chart.yaml index 5be19d0a..359c6113 100644 --- a/galaxy/Chart.yaml +++ b/galaxy/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: galaxy type: application version: 5.7.6 -appVersion: "23.0" +appVersion: "23.1" description: Chart for Galaxy, an open, web-based platform for accessible, reproducible, and transparent computational biomedical research. icon: https://galaxyproject.org/images/galaxy-logos/galaxy_project_logo_square.png dependencies: From 49c054f6f657b6c3b442667a209fe894a830848b Mon Sep 17 00:00:00 2001 From: Keith Suderman Date: Wed, 11 Oct 2023 10:39:37 -0400 Subject: [PATCH 2/8] Update the image.tag version --- galaxy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy/values.yaml b/galaxy/values.yaml index 85a7273e..b03befdd 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -10,7 +10,7 @@ image: #- Repository containing the Galaxy image. repository: quay.io/galaxyproject/galaxy-min #- Galaxy Docker image tag (generally corresponds to the desired Galaxy version) - tag: "23.0" # Value must be quoted + tag: "23.1" # Value must be quoted #- Galaxy image [pull policy](https://kubernetes.io/docs/concepts/configuration/overview/#container-images) pullPolicy: IfNotPresent From d3df0a83cb12c72b72887f4f960a3b6b69540df0 Mon Sep 17 00:00:00 2001 From: Keith Suderman Date: Wed, 11 Oct 2023 18:45:20 -0400 Subject: [PATCH 3/8] Revert the image.tag to trigger another build --- galaxy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy/values.yaml b/galaxy/values.yaml index b03befdd..85a7273e 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -10,7 +10,7 @@ image: #- Repository containing the Galaxy image. repository: quay.io/galaxyproject/galaxy-min #- Galaxy Docker image tag (generally corresponds to the desired Galaxy version) - tag: "23.1" # Value must be quoted + tag: "23.0" # Value must be quoted #- Galaxy image [pull policy](https://kubernetes.io/docs/concepts/configuration/overview/#container-images) pullPolicy: IfNotPresent From c7774291b160e8d350552f273d598552ecfd015e Mon Sep 17 00:00:00 2001 From: Keith Suderman Date: Wed, 11 Oct 2023 18:52:53 -0400 Subject: [PATCH 4/8] Back to 23.1 --- galaxy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy/values.yaml b/galaxy/values.yaml index 85a7273e..b03befdd 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -10,7 +10,7 @@ image: #- Repository containing the Galaxy image. repository: quay.io/galaxyproject/galaxy-min #- Galaxy Docker image tag (generally corresponds to the desired Galaxy version) - tag: "23.0" # Value must be quoted + tag: "23.1" # Value must be quoted #- Galaxy image [pull policy](https://kubernetes.io/docs/concepts/configuration/overview/#container-images) pullPolicy: IfNotPresent From 444b03cd8ca86183e812e7f22367d8196e2a29bb Mon Sep 17 00:00:00 2001 From: Keith Suderman Date: Thu, 12 Oct 2023 09:33:47 -0400 Subject: [PATCH 5/8] Allow test to be run on workflow dispatch. Revert to k3s 1.25 --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e9ab20ae..1372c862 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,6 +5,7 @@ on: - master - anvil pull_request: {} + workflow_dispatch: {} jobs: linting: runs-on: ubuntu-latest @@ -33,7 +34,7 @@ jobs: - name: Start k8s locally uses: jupyterhub/action-k3s-helm@v3 with: - k3s-version: v1.26.1+k3s1 # releases: https://github.com/k3s-io/k3s/tags + k3s-version: v1.25.14+k3s1 #v1.26.1+k3s1 # releases: https://github.com/k3s-io/k3s/tags metrics-enabled: false traefik-enabled: false - name: Verify function of k8s, kubectl, and helm From abe0c18adc6fc13f838c22d74e2dc00d45974058 Mon Sep 17 00:00:00 2001 From: Keith Suderman Date: Tue, 17 Oct 2023 15:30:40 -0400 Subject: [PATCH 6/8] Try testing with the 23.1-auto image --- galaxy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy/values.yaml b/galaxy/values.yaml index b03befdd..27c59bb2 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -10,7 +10,7 @@ image: #- Repository containing the Galaxy image. repository: quay.io/galaxyproject/galaxy-min #- Galaxy Docker image tag (generally corresponds to the desired Galaxy version) - tag: "23.1" # Value must be quoted + tag: "23.1-auto" # Value must be quoted #- Galaxy image [pull policy](https://kubernetes.io/docs/concepts/configuration/overview/#container-images) pullPolicy: IfNotPresent From cc219e291df7bc597bff1b346635300c2e1aefb4 Mon Sep 17 00:00:00 2001 From: Keith Suderman Date: Wed, 18 Oct 2023 12:46:06 -0400 Subject: [PATCH 7/8] Back to 23.1 --- galaxy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy/values.yaml b/galaxy/values.yaml index 27c59bb2..b03befdd 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -10,7 +10,7 @@ image: #- Repository containing the Galaxy image. repository: quay.io/galaxyproject/galaxy-min #- Galaxy Docker image tag (generally corresponds to the desired Galaxy version) - tag: "23.1-auto" # Value must be quoted + tag: "23.1" # Value must be quoted #- Galaxy image [pull policy](https://kubernetes.io/docs/concepts/configuration/overview/#container-images) pullPolicy: IfNotPresent From 0c30c34e969d256e5329b0f5cef0ff696071b5b0 Mon Sep 17 00:00:00 2001 From: Enis Afgan Date: Thu, 16 Nov 2023 12:19:02 -0500 Subject: [PATCH 8/8] Update the path to base css file --- .github/workflows/test.yaml | 2 +- galaxy/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1372c862..bbde0299 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -34,7 +34,7 @@ jobs: - name: Start k8s locally uses: jupyterhub/action-k3s-helm@v3 with: - k3s-version: v1.25.14+k3s1 #v1.26.1+k3s1 # releases: https://github.com/k3s-io/k3s/tags + k3s-version: v1.25.15+k3s2 # releases: https://github.com/k3s-io/k3s/tags metrics-enabled: false traefik-enabled: false - name: Verify function of k8s, kubectl, and helm diff --git a/galaxy/values.yaml b/galaxy/values.yaml index b03befdd..9c85c0c0 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -616,7 +616,7 @@ extraFileMappings: - +