Compare commits

...

6 commits

Author SHA1 Message Date
Bruno BELANYI 59417f5c29 Update CI to use exec runner
All checks were successful
continuous-integration/drone/push Build is passing
The docker runner is too flaky, such as when updating the kernel on the
server and not rebooting... Partly my fault, but I'm too lazy to do it.
2021-08-08 18:29:44 +02:00
Bruno BELANYI ab3e1ca30d build: makefile: change title on dev deployment 2021-08-08 18:29:02 +02:00
Bruno BELANYI e96fbee9dd ci: use exec runner 2021-08-08 18:29:02 +02:00
Bruno BELANYI bd20edffc5 nix: use nixpkgs-unstable 2021-08-08 16:04:44 +02:00
Bruno BELANYI 549c396776 build: makefile: simplify 2021-08-08 16:01:55 +02:00
Bruno BELANYI 70a460aede themes: anubis: bump submodule 2021-08-08 15:50:27 +02:00
5 changed files with 43 additions and 53 deletions

View file

@ -1,58 +1,59 @@
local Pipeline(isDev) = {
kind: "pipeline",
name: if isDev then "deploy-dev" else "deploy-prod",
type: "exec",
name: if isDev then "Deploy to dev" else "Deploy to prod",
# Dev ignores "master", prod only triggers on "master"
trigger: { branch: { [if isDev then "exclude" else "include"]: [ "main" ] } },
# We want to clone the submodules, which isn't done by default
clone: { disable: true },
steps: [
{
name: "clone",
image: "plugins/git",
recursive: true,
# We want to clone the submodules, which isn't done by default
name: "submodules",
commands: [
"git submodule update --recursive --init",
]
},
{
name: "markdownlint",
image: "06kellyjac/markdownlint-cli",
# Include pre-commit checks, which include markdownlint
name: "check",
commands: [
"markdownlint --version",
"markdownlint content/",
"nix flake check",
],
},
{
# If dev, include drafts and future articles, change base URL
name: "build",
image: "klakegg/hugo",
commands: [
"hugo version",
# If dev, include drafts and future articles, change base URL
"hugo --minify" + if isDev then " -D -F -b https://dev.belanyi.fr" else "",
"nix develop -c make " + if isDev then "build-dev" else "build-prod",
],
[if !isDev then "environment"]: { HUGO_ENV: "production" }
},
{
name: "deploy",
image: "appleboy/drone-scp",
settings: {
source: "public/*",
strip_components: 1, # Remove 'public/' suffix from file paths
rm: true, # Remove previous files from target directory
host: { from_secret: "ssh_host" },
target: { from_secret: "ssh_target" + if isDev then "_dev" else "" },
username: { from_secret: "ssh_user" },
key: { from_secret: "ssh_key" },
port: { from_secret: "ssh_port" },
commands: [
"nix run github:ambroisie/nix-config#drone-scp",
],
environment: {
SCP_SOURCE: "public/*",
SCP_STRIP_COMPONENTS: 1, # Remove 'public/' suffix from file paths
SCP_RM: true, # Remove previous files from target directory
SCP_HOST: { from_secret: "ssh_host" },
SCP_TARGET: { from_secret: "ssh_target" + if isDev then "_dev" else "" },
SCP_USERNAME: { from_secret: "ssh_user" },
SCP_KEY: { from_secret: "ssh_key" },
SCP_PORT: { from_secret: "ssh_port" },
},
},
{
name: "notify",
image: "plugins/matrix",
settings: {
homeserver: { from_secret: "matrix_homeserver" },
roomid: { from_secret: "matrix_roomid" },
username: { from_secret: "matrix_username" },
password: { from_secret: "matrix_password" },
commands: [
"nix run github:ambroisie/matrix-notifier",
],
environment: {
ADDRESS: { from_secret: "matrix_homeserver" },
ROOM: { from_secret: "matrix_roomid" },
USER: { from_secret: "matrix_username" },
PASS: { from_secret: "matrix_password" },
},
trigger: { status: [ "failure", "success", ] },
when: { status: [ "failure", "success", ] },
},
]
};

View file

@ -1,28 +1,18 @@
.PHONY: all
all: build
.PHONY: build
build: build-dev
all: build-dev
.PHONY: build-dev
build-dev:
hugo -D -F
HUGO_TITLE="Ambroisie's dev blog" HUGO_BASEURL=https://dev.belanyi.fr hugo -D -F
.PHONY: build-prod
build-prod:
HUGO_ENV=production hugo
HUGO_ENV=production hugo --minify
.PHONY: serve
serve: serve-dev
.PHONY: serve-dev
serve-dev:
serve:
hugo server -D -F
.PHONY: serve-prod
serve-prod:
hugo server
.PHONY: clean
clean:
$(RM) -r public

View file

@ -18,16 +18,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1622282707,
"narHash": "sha256-+GOrUDsdneUqrOm9d+9bHXjEVoVcU8tm14WGVzbt6gg=",
"lastModified": 1628320020,
"narHash": "sha256-4xBEb+TOHyIGpK37EVsZx6dGPwNMf5YWNBJaQ4VyZws=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6933d068c5d2fcff398e802f7c4e271bbdab6705",
"rev": "67c80531be622641b5b2ccc3a7aff355cb02476b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}

View file

@ -9,12 +9,11 @@
ref = "master";
};
# https://nixpk.gs/pr-tracker.html?pr=124808
nixpkgs = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-unstable";
ref = "nixpkgs-unstable";
};
pre-commit-hooks = {

@ -1 +1 @@
Subproject commit b43d933019d2789c43914f20242c857f10029611
Subproject commit 5dab60e04a37896c09a32137aefe821c63b3af04