diff --git a/.github/workflows/develop-api.yaml b/.github/workflows/develop-api.yaml index cb824349e4..20dcd5ebfe 100644 --- a/.github/workflows/develop-api.yaml +++ b/.github/workflows/develop-api.yaml @@ -8,7 +8,8 @@ on: - 'frontend/**' - '.github/workflows/lexbox-api.yaml' - '.github/workflows/deploy.yaml' - - 'deployment/lexbox-deployment.yaml' + - 'deployment/base/lexbox-deployment.yaml' + - 'deployment/base/hg-deployment.yaml' branches: - develop pull_request: @@ -18,7 +19,8 @@ on: - 'frontend/**' - '.github/workflows/lexbox-api.yaml' - '.github/workflows/deploy.yaml' - - 'deployment/lexbox-deployment.yaml' + - 'deployment/base/lexbox-deployment.yaml' + - 'deployment/base/hg-deployment.yaml' branches: - develop diff --git a/.github/workflows/integration-test-gha.yaml b/.github/workflows/integration-test-gha.yaml index 42ba7a6a8e..f18eba9fc4 100644 --- a/.github/workflows/integration-test-gha.yaml +++ b/.github/workflows/integration-test-gha.yaml @@ -41,7 +41,7 @@ jobs: run: dotnet test LexBoxOnly.slnf --logger GitHubActions --filter "Category=Integration|Category=FlakyIntegration" --blame-hang-timeout 40m - name: status - if: failure() + if: failure() || cancelled() run: | mkdir -p k8s-logs for app in lexbox ui hg db fw-headless; do @@ -50,7 +50,7 @@ jobs: done kubectl logs -l 'app.kubernetes.io/name=ingress-nginx' -n languagedepot --prefix --all-containers --tail=-1 > k8s-logs/logs-ingress.txt - name: upload status - if: failure() + if: failure() || cancelled() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: dotnet-k8s-logs @@ -76,7 +76,7 @@ jobs: viewer-tests: 'false' # exclude the viewer page tests, because mongo is not available - name: status - if: failure() + if: failure() || cancelled() run: | mkdir -p k8s-logs for app in lexbox ui hg db fw-headless; do @@ -85,7 +85,7 @@ jobs: done kubectl logs -l 'app.kubernetes.io/name=ingress-nginx' -n languagedepot --prefix --all-containers --tail=-1 > k8s-logs/logs-ingress.txt - name: upload status - if: failure() + if: failure() || cancelled() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: name: playwright-k8s-logs diff --git a/deployment/base/hg-deployment.yaml b/deployment/base/hg-deployment.yaml index d2db84e9b2..beb546b542 100644 --- a/deployment/base/hg-deployment.yaml +++ b/deployment/base/hg-deployment.yaml @@ -147,7 +147,7 @@ spec: - name: hgresumable - image: ghcr.io/sillsdev/hgresume:v2024-05-28 + image: ghcr.io/sillsdev/hgresume:v2026-08-04 # https://kubernetes.io/docs/concepts/configuration/manage-resources-containers resources: requests: diff --git a/deployment/production/hg-deployment.yaml b/deployment/production/hg-deployment.yaml index 87d5ea08a9..9e645c255c 100644 --- a/deployment/production/hg-deployment.yaml +++ b/deployment/production/hg-deployment.yaml @@ -14,6 +14,8 @@ spec: limits: memory: 1000Mi - name: hgresumable + # Keep production on the pre-rewrite image until the new hgresume is validated elsewhere. + image: ghcr.io/sillsdev/hgresume:v2024-05-28 resources: requests: memory: 1000Mi