diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 8752c88..7a378f3 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,7 +24,7 @@ on: - .gitea/workflows/deploy.yml env: - PORTAL_RELEASE: v0.5.2 + PORTAL_RELEASE: v0.6.24 INSTANCE: westra-portal jobs: diff --git a/.gitea/workflows/lint-and-reload.yml b/.gitea/workflows/lint-and-reload.yml index 346393e..f2eecc7 100644 --- a/.gitea/workflows/lint-and-reload.yml +++ b/.gitea/workflows/lint-and-reload.yml @@ -1,4 +1,4 @@ -# Lint on the kasse host runner (the portal binary lives there), then +# Lint on the kasse host runner with the portal release this site runs, then # nudge the running portal to refetch content over local NATS. name: lint-and-reload on: @@ -12,12 +12,15 @@ jobs: - name: checkout run: | rm -rf checkout && git clone --depth 1 https://prosjekt.klingenbergbygg.no/westra/questions.git checkout + # The lint is portal itself (`portal lint`), at the version this + # site runs (PORTAL_RELEASE in deploy.yml), so what passes here is + # what the running instance accepts. - name: lint env: - IRIS_RELEASE: v0.5.2 + PORTAL_RELEASE: v0.6.24 run: | - curl -sfL "https://project.uhhm.no/uhhm/iris/releases/download/$IRIS_RELEASE/iris" -o iris && chmod +x iris - ./iris check --path checkout/questions + curl -sfL "https://project.uhhm.no/uhhm/portal/releases/download/$PORTAL_RELEASE/portal-x86_64-linux" -o portal && chmod +x portal + ./portal lint --path checkout/questions - name: reload run: | nats --server nats://127.0.0.1:4222 pub portal.content.reload "" diff --git a/README.md b/README.md index a143d1e..ce499e0 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,5 @@ it existed. Norwegian is the source language. `naerbilde.jpg` (Jannicke) is missing because it 404s on the source site itself — ask for a replacement. -Lint before pushing: `question_lint --path questions`. +Lint before pushing: `portal lint --path questions`, with the portal +release `.gitea/workflows/deploy.yml` pins.