Compare commits
5
Commits
test
..
7e2921f6b8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e2921f6b8
|
||
|
|
894d313dc4
|
||
|
|
fdae293834
|
||
|
|
c67160b6ff
|
||
|
|
473826aad6
|
No files matched your search
+23
-13
@@ -1,25 +1,35 @@
|
|||||||
name: Deploy test instance
|
name: Deploy instance
|
||||||
|
|
||||||
# Branch `test` is portal.test.klingenbergbygg.no: the newest portal
|
# This content repo owns its portal instance: which portal version runs
|
||||||
# release (cut from uhhm/portal main), with a NATS of its own on kasse,
|
# on kasse. uhhm/portal only publishes versioned release artifacts;
|
||||||
# so nothing tried here reaches production or mails a customer. The
|
# PORTAL_RELEASE below pins the one this site runs, so every rollout is
|
||||||
# production site is branch `main`, pinned in its own deploy.yml.
|
# 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.
|
||||||
|
|
||||||
# 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:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
branches: [test]
|
branches: [main]
|
||||||
|
paths:
|
||||||
|
- .gitea/workflows/deploy.yml
|
||||||
|
|
||||||
env:
|
env:
|
||||||
INSTANCE: klingenberg-test
|
PORTAL_RELEASE: v0.6.3
|
||||||
|
INSTANCE: klingenberg-portal
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
runs-on: fish
|
runs-on: fish
|
||||||
steps:
|
steps:
|
||||||
- name: Ship the newest release and restart
|
- name: Ship the pinned release and restart
|
||||||
run: |
|
run: sudo /usr/local/bin/deploy-portal-instance "$INSTANCE" "$PORTAL_RELEASE"
|
||||||
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
|
name: lint-and-reload
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [test]
|
branches: [main]
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
runs-on: fish
|
runs-on: fish
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- name: checkout
|
||||||
run: |
|
run: |
|
||||||
rm -rf checkout && git clone --depth 1 --branch test https://prosjekt.klingenbergbygg.no/klingenbergbygg/questions.git checkout
|
rm -rf checkout && git clone --depth 1 https://prosjekt.klingenbergbygg.no/klingenbergbygg/questions.git checkout
|
||||||
# The lint is portal itself, at the newest release: the one the
|
# The lint is portal itself (`portal lint`), at the version this
|
||||||
# test instance runs.
|
# site runs (PORTAL_RELEASE in deploy.yml).
|
||||||
- name: lint
|
- name: lint
|
||||||
|
env:
|
||||||
|
PORTAL_RELEASE: v0.6.3
|
||||||
run: |
|
run: |
|
||||||
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/$PORTAL_RELEASE/portal-x86_64-linux" -o portal && chmod +x portal
|
||||||
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
|
./portal lint --path checkout/questions
|
||||||
# The test instance's own NATS, never production's.
|
|
||||||
- name: reload
|
- name: reload
|
||||||
run: nats --server nats://127.0.0.1:4232 pub portal.content.reload ""
|
run: nats --server nats://127.0.0.1:4222 pub portal.content.reload ""
|
||||||
+3
-10
@@ -106,22 +106,15 @@ h1, h2, h3 {
|
|||||||
opacity: 1;
|
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 {
|
.session {
|
||||||
|
top: 1.75rem;
|
||||||
|
right: max(1.5rem, calc((100vw - var(--measure)) / 2 + 1.5rem));
|
||||||
font-family: var(--heading);
|
font-family: var(--heading);
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-top {
|
|
||||||
justify-content: space-between;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hero-top .session {
|
|
||||||
position: static;
|
|
||||||
transform: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.slideshow {
|
.slideshow {
|
||||||
--swiper-navigation-size: 1.6rem;
|
--swiper-navigation-size: 1.6rem;
|
||||||
background: var(--line);
|
background: var(--line);
|
||||||
|
|||||||
@@ -35,12 +35,10 @@ alternatives:
|
|||||||
label: Navn
|
label: Navn
|
||||||
type: text
|
type: text
|
||||||
placeholder: Navn
|
placeholder: Navn
|
||||||
value: '{user.name}'
|
|
||||||
- name: email
|
- name: email
|
||||||
label: E-post
|
label: E-post
|
||||||
type: email
|
type: email
|
||||||
placeholder: bruker@eksempel.no
|
placeholder: bruker@eksempel.no
|
||||||
value: '{user.email}'
|
|
||||||
- name: telefon
|
- name: telefon
|
||||||
label: Telefon
|
label: Telefon
|
||||||
type: tel
|
type: tel
|
||||||
@@ -93,12 +91,10 @@ alternatives:
|
|||||||
label: Navn
|
label: Navn
|
||||||
type: text
|
type: text
|
||||||
placeholder: Navn
|
placeholder: Navn
|
||||||
value: '{user.name}'
|
|
||||||
- name: email
|
- name: email
|
||||||
label: E-post
|
label: E-post
|
||||||
type: email
|
type: email
|
||||||
placeholder: bruker@eksempel.no
|
placeholder: bruker@eksempel.no
|
||||||
value: '{user.email}'
|
|
||||||
- name: telefon
|
- name: telefon
|
||||||
label: Telefon
|
label: Telefon
|
||||||
type: tel
|
type: tel
|
||||||
@@ -221,7 +217,7 @@ slideshow:
|
|||||||
- image: images/bildeserie/20.webp
|
- image: images/bildeserie/20.webp
|
||||||
width: 1867
|
width: 1867
|
||||||
height: 1400
|
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
|
- image: images/bildeserie/21.webp
|
||||||
width: 1867
|
width: 1867
|
||||||
height: 1400
|
height: 1400
|
||||||
@@ -241,4 +237,4 @@ slideshow:
|
|||||||
- image: images/bildeserie/25.webp
|
- image: images/bildeserie/25.webp
|
||||||
width: 1487
|
width: 1487
|
||||||
height: 1400
|
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