Merge branch 'main' into feature/mailman-nixos-module
Some checks are pending
continuous-integration/drone/push Build is pending
continuous-integration/drone/pr Build is pending

This commit is contained in:
teutat3s 2023-02-25 18:37:06 +01:00
commit 648a50c47e
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
2 changed files with 4 additions and 5 deletions

View file

@ -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
...

View file

@ -31,6 +31,6 @@ with self; ''
--style="''${BAT_STYLE:-numbers}" \
--color=always \
--pager=never \
--file-name=''$FILE \
--file-name="''$FILE" \
--highlight-line=$CENTER
''