Skip to content

Commit

Permalink
Merge pull request #68 from kartoza/develop
Browse files Browse the repository at this point in the history
Update main
  • Loading branch information
NyakudyaA authored Dec 23, 2023
2 parents 0a84d44 + ed66206 commit fc24c40
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
25 changes: 14 additions & 11 deletions .github/workflows/chart-lint.yaml
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
name: Lint and Test Charts

on: pull_request
on:
pull_request:
workflow_dispatch:

jobs:
lint-test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Fetch history
run: git fetch --prune --unshallow

- name: Set up Helm
uses: azure/setup-helm@v1
uses: azure/setup-helm@v3
with:
version: 'v3.4.0'

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: 3.7

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.0.1
uses: helm/chart-testing-action@v2.6.0

- name: Set up nix
uses: cachix/install-nix-action@v12
uses: cachix/install-nix-action@v24
with:
nix_path: nixpkgs=channel:nixos-unstable

- name: Set up nix store cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: /tmp/nix-closure
# Build inputs are:
Expand All @@ -46,12 +48,13 @@ jobs:
run: |
if [[ -f /tmp/nix-closure/nix-shell.closure ]]; then
nix-store --import --option require-sigs false < /tmp/nix-closure/nix-shell.closure
echo "::set-output name=use-cache::true"
echo "use-cache=true" >> $GITHUB_OUTPUT
fi
- run: |
nix-env -f '<nixpkgs>' -iA pkgs.direnv
nix-build
nix-shell --run "direnv allow"
- name: Store nix derivation cache
run: |
DERIVATION=$(readlink result)
Expand All @@ -65,7 +68,7 @@ jobs:
run: |
changed=$(ct list-changed)
if [[ -n "$changed" ]]; then
echo "::set-output name=changed::true"
echo "use-cache=true" >> $GITHUB_OUTPUT
fi
- name: Run chart-testing (lint)
Expand All @@ -74,9 +77,9 @@ jobs:
run: ct lint

- name: Create kind cluster
uses: helm/kind-action@v1.2.0
uses: helm/kind-action@v1.5.0
with:
node_image: "kindest/node:v1.19.1"
node_image: "kindest/node:v1.29.0"
# Only build a kind cluster if there are chart changes to test.
if: steps.list-changed.outputs.changed == 'true'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion charts/geoserver/v0.3.3/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
registry: docker.io
repository: kartoza/geoserver
tag: "2.21.0"
tag: "2.24.1"
pullPolicy: IfNotPresent

geoserverDataDir: /opt/geoserver/data_dir
Expand Down

0 comments on commit fc24c40

Please sign in to comment.