Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9ae0e178db
|
||
|
|
414715d64f
|
||
|
|
8ae162f143
|
||
|
|
6de2febec1
|
||
|
|
93c6b6e6c5
|
No files matched your search
+13
-23
@@ -1,35 +1,25 @@
|
||||
name: Deploy instance
|
||||
name: Deploy test instance
|
||||
|
||||
# This content repo owns its portal instance: which portal version runs
|
||||
# on kasse. uhhm/portal only publishes versioned release artifacts;
|
||||
# PORTAL_RELEASE below pins the one this site runs, so every rollout is
|
||||
# a commit - auditable, and revertable by reverting it.
|
||||
#
|
||||
# Content-only changes never come through here: lint-and-reload
|
||||
# hot-swaps those into the running instance over NATS.
|
||||
#
|
||||
# Runs on the host runner, because a deploy has to touch this host's
|
||||
# filesystem and its units. It is allowed exactly one root action:
|
||||
# /usr/local/bin/deploy-portal-instance, which checks the instance
|
||||
# against a fixed list and the tag against a release-tag shape before
|
||||
# it touches anything, and health-checks the site afterwards without a
|
||||
# forwarded header - a check that sends the header Caddy would send
|
||||
# cannot tell you the site is broken for everything that is not Caddy.
|
||||
# Branch `test` is portal.test.klingenbergbygg.no: the newest portal
|
||||
# release (cut from uhhm/portal main), with a NATS of its own on kasse,
|
||||
# so nothing tried here reaches production or mails a customer. The
|
||||
# production site is branch `main`, pinned in its own deploy.yml.
|
||||
|
||||
# Every push: a test site that follows the newest release has no pin
|
||||
# to change, so a push is the moment to pick the newest up.
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main]
|
||||
paths:
|
||||
- .gitea/workflows/deploy.yml
|
||||
branches: [test]
|
||||
|
||||
env:
|
||||
PORTAL_RELEASE: v0.6.3
|
||||
INSTANCE: klingenberg-portal
|
||||
INSTANCE: klingenberg-test
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: fish
|
||||
steps:
|
||||
- name: Ship the pinned release and restart
|
||||
run: sudo /usr/local/bin/deploy-portal-instance "$INSTANCE" "$PORTAL_RELEASE"
|
||||
- name: Ship the newest release and restart
|
||||
run: |
|
||||
tag=$(curl -sf https://project.uhhm.no/api/v1/repos/uhhm/portal/releases/latest | jq -r .tag_name)
|
||||
sudo /usr/local/bin/deploy-portal-instance "$INSTANCE" "$tag"
|
||||
@@ -1,21 +1,21 @@
|
||||
name: lint-and-reload
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
branches: [test]
|
||||
jobs:
|
||||
lint:
|
||||
runs-on: fish
|
||||
steps:
|
||||
- name: checkout
|
||||
run: |
|
||||
rm -rf checkout && git clone --depth 1 https://prosjekt.klingenbergbygg.no/klingenbergbygg/questions.git checkout
|
||||
# The lint is portal itself (`portal lint`), at the version this
|
||||
# site runs (PORTAL_RELEASE in deploy.yml).
|
||||
rm -rf checkout && git clone --depth 1 --branch test https://prosjekt.klingenbergbygg.no/klingenbergbygg/questions.git checkout
|
||||
# The lint is portal itself, at the newest release: the one the
|
||||
# test instance runs.
|
||||
- name: lint
|
||||
env:
|
||||
PORTAL_RELEASE: v0.6.3
|
||||
run: |
|
||||
curl -sfL "https://project.uhhm.no/uhhm/portal/releases/download/$PORTAL_RELEASE/portal-x86_64-linux" -o portal && chmod +x portal
|
||||
tag=$(curl -sf https://project.uhhm.no/api/v1/repos/uhhm/portal/releases/latest | jq -r .tag_name)
|
||||
curl -sfL "https://project.uhhm.no/uhhm/portal/releases/download/$tag/portal-x86_64-linux" -o portal && chmod +x portal
|
||||
./portal lint --path checkout/questions
|
||||
# The test instance's own NATS, never production's.
|
||||
- name: reload
|
||||
run: nats --server nats://127.0.0.1:4222 pub portal.content.reload ""
|
||||
run: nats --server nats://127.0.0.1:4232 pub portal.content.reload ""
|
||||
+3
-10
@@ -106,22 +106,15 @@ h1, h2, h3 {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
/* Who is here sits on the wordmark's line, at the page's right edge. */
|
||||
/* Who is here sits on the bar's line, at the page's right edge. */
|
||||
.session {
|
||||
top: 1.75rem;
|
||||
right: max(1.5rem, calc((100vw - var(--measure)) / 2 + 1.5rem));
|
||||
font-family: var(--heading);
|
||||
font-weight: 500;
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
|
||||
.hero-top {
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.hero-top .session {
|
||||
position: static;
|
||||
transform: none;
|
||||
}
|
||||
|
||||
.slideshow {
|
||||
--swiper-navigation-size: 1.6rem;
|
||||
background: var(--line);
|
||||
|
||||
@@ -35,12 +35,10 @@ alternatives:
|
||||
label: Navn
|
||||
type: text
|
||||
placeholder: Navn
|
||||
value: '{user.name}'
|
||||
- name: email
|
||||
label: E-post
|
||||
type: email
|
||||
placeholder: bruker@eksempel.no
|
||||
value: '{user.email}'
|
||||
- name: telefon
|
||||
label: Telefon
|
||||
type: tel
|
||||
@@ -93,12 +91,10 @@ alternatives:
|
||||
label: Navn
|
||||
type: text
|
||||
placeholder: Navn
|
||||
value: '{user.name}'
|
||||
- name: email
|
||||
label: E-post
|
||||
type: email
|
||||
placeholder: bruker@eksempel.no
|
||||
value: '{user.email}'
|
||||
- name: telefon
|
||||
label: Telefon
|
||||
type: tel
|
||||
@@ -221,7 +217,7 @@ slideshow:
|
||||
- image: images/bildeserie/20.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Her heises Moelvens modulskole i Vestby på plass. Den blir stående i minst 10 år.
|
||||
caption: Her heises Moelvens modulskole i Vestby på plass. Den blir stående i 10 år.
|
||||
- image: images/bildeserie/21.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
@@ -241,4 +237,4 @@ slideshow:
|
||||
- image: images/bildeserie/25.webp
|
||||
width: 1487
|
||||
height: 1400
|
||||
caption: pH-test av borprøver i betong fra forskjellige dybder
|
||||
caption: pH-test av borprøver i mur fra forskjellige dybder
|
||||
Reference in new issue
Block a user