Merge branch 'main' into feature/mailman-nixos-module
This commit is contained in:
commit
648a50c47e
|
@ -111,9 +111,8 @@ steps:
|
|||
- nix run nixpkgs#gnused -- --in-place "s/$ISO_NAME/PubSolarOS-latest.iso/" PubSolarOS-latest.iso.sha256
|
||||
|
||||
- name: "Publish ISO"
|
||||
# custom drone-scp image, source: https://git.b12f.io/pub-solar/drone-scp/
|
||||
# docker build --tag registry.greenbaum.cloud/library/drone-scp:v1.6.5 --file ./docker/Dockerfile.linux.amd64 .
|
||||
image: registry.greenbaum.cloud/library/drone-scp:v1.6.5
|
||||
# https://github.com/appleboy/drone-scp/pull/141 got merged, yay
|
||||
image: appleboy/drone-scp:1.6.5-linux-amd64
|
||||
volumes:
|
||||
- name: file-exchange
|
||||
path: /var/nix/iso-cache
|
||||
|
@ -148,6 +147,6 @@ volumes:
|
|||
|
||||
---
|
||||
kind: signature
|
||||
hmac: 59c35601e641341216eaba764756a96dfe9137f7c6255aa889b12c73af77f244
|
||||
hmac: d6187b243c1939eaf2803830e784aa89dd20edda9ba205940cf6caa2c615b6c6
|
||||
|
||||
...
|
||||
|
|
|
@ -31,6 +31,6 @@ with self; ''
|
|||
--style="''${BAT_STYLE:-numbers}" \
|
||||
--color=always \
|
||||
--pager=never \
|
||||
--file-name=''$FILE \
|
||||
--file-name="''$FILE" \
|
||||
--highlight-line=$CENTER
|
||||
''
|
||||
|
|
Loading…
Reference in a new issue