Compare commits

...

4 commits

Author SHA1 Message Date
Bruno BELANYI 83c66e7d46 WIP: ci: fix 'TYPE' variable usage
All checks were successful
ci/woodpecker/push/deploy Pipeline was successful
ci/woodpecker/manual/deploy Pipeline was successful
I *think* this way should have worked, but it doesn't [1].

So let's use an actual variable instead of interpolation, which *should*
work.
2023-11-01 19:15:25 +01:00
Bruno BELANYI 3286e92f59 content: wish-lists: add knives 2023-10-13 18:36:06 +01:00
Bruno BELANYI 9d5307f8cb content: wish-lists: add chef's presses links 2023-10-13 18:35:28 +01:00
Bruno BELANYI 00af2959d0 nix: bump flake inputs 2023-08-04 23:18:24 +01:00
4 changed files with 39 additions and 26 deletions

View file

@ -1,6 +1,3 @@
variables:
- &all_events ["push", "cron", "deployment", "manual"]
labels:
backend: local
@ -16,24 +13,19 @@ matrix:
# Run the correct matrix build on the correct branch
when:
evaluate: |
CI_PIPELINE_EVENT in ["push", "cron", "deployment", "manual"]
and ((CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH) == ("${TYPE}" == "prod"))
(CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH) == (TYPE == "prod")
pipeline:
- name: check
image: bash
commands:
- nix flake check
when:
event: *all_events
- name: build (${TYPE})
image: bash
commands:
# If dev, include drafts and future articles, change base URL
- nix develop -c make ${MAKE_TARGET}
when:
event: *all_events
- name: deploy (${TYPE})
image: bash
@ -53,8 +45,6 @@ pipeline:
target: sync_host
commands:
- "nix run github:ambroisie/nix-config#drone-rsync"
when:
event: *all_events
- name: notify
image: bash
@ -70,7 +60,6 @@ pipeline:
commands:
- nix run github:ambroisie/matrix-notifier
when:
event: *all_events
status:
- failure
- success

View file

@ -16,4 +16,10 @@ A few of my Amazon wish lists in case you want to give me a gift.
* [Programming](https://www.amazon.fr/hz/wishlist/ls/1R4KFV4H2D8IF)
* Other items:
* [Chef's presses](https://www.thechefspress.com/shop)
* [UK link](https://www.kitchenprovisions.co.uk/products/the-chefs-press-8oz-13oz)
* [FR link](https://www.thekitchenlab.fr/fr/p/la-presse-du-chef-poids-de-friture-bruce-hill-13-oz/)
* Knives
* [Gyuto, damascus finish, 210mm](https://www.kitchenprovisions.co.uk/collections/stainless-steel/products/gyuto-knife-vg10-damascus-finish-ohishi)
* [Gyuto, nashiji finish, 240mm](https://www.kitchenprovisions.co.uk/collections/kanehiro/products/gyuto-knife-ginsan-stainless-steel-nashiji-finish-kanehiro?variant=39743550718014)
* [Gyuto, polished finish, black ferrule 240mm](https://www.kitchenprovisions.co.uk/collections/sukenari/products/gyuto-knife-hap40-powder-steel-polished-finish-sukenari?variant=39743545016382)
* [Lego bonsai tree](https://www.lego.com/en-gb/product/bonsai-tree-10281)

View file

@ -3,11 +3,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1668681692,
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
@ -17,17 +17,20 @@
}
},
"futils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
"owner": "numtide",
"ref": "master",
"ref": "main",
"repo": "flake-utils",
"type": "github"
}
@ -55,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1671997655,
"narHash": "sha256-8zUwvnJrBwiFIdw9VgARj1PIQsto5Spn9J5v34b0O7A=",
"lastModified": 1691155369,
"narHash": "sha256-CIuJO5pgwCMsZM8flIU2OiZ79QfDCesXPsAiokCzlNM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aac1f0b25e6b04afad8e05dec5828f5c02398bd1",
"rev": "7d050b98e51cdbdd88ad960152d398d41c7ff5b4",
"type": "github"
},
"original": {
@ -84,11 +87,11 @@
]
},
"locked": {
"lastModified": 1672050129,
"narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=",
"lastModified": 1691093055,
"narHash": "sha256-sjNWYpDHc6vx+/M0WbBZKltR0Avh2S43UiDbmYtfHt0=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c",
"rev": "ebb43bdacd1af8954d04869c77bc3b61fde515e4",
"type": "github"
},
"original": {
@ -104,6 +107,21 @@
"nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

View file

@ -6,7 +6,7 @@
type = "github";
owner = "numtide";
repo = "flake-utils";
ref = "master";
ref = "main";
};
nixpkgs = {