Compare commits

..

No commits in common. "06bd717dfbbeb4f08941e7586dfe855d6e0e1f51" and "3ca5d76682b9fe6d4304b95bdea16c7f0f9c1624" have entirely different histories.

2 changed files with 5 additions and 6 deletions

View File

@ -18,7 +18,7 @@ jobs:
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Cache Docker layers - name: Cache Docker layers
uses: https://github.com/actions/cache/restore@v3 uses: https://github.com/actions/cache@v3
with: with:
path: | path: |
/tmp/.buildx-cache /tmp/.buildx-cache
@ -42,12 +42,12 @@ jobs:
push: true push: true
tags: git.nerdcult.net/nerdcult/nerdcult_admin_worker:latest tags: git.nerdcult.net/nerdcult/nerdcult_admin_worker:latest
cache-from: type=local,src=/tmp/.buildx-cache cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max cache-to: type=local,dest=/tmp/.buildx-cache-new
- name: Rotate the cache - name: Rotate the cache
run: | run: |
rm -rvf /tmp/.buildx-cache rm -rf /tmp/.buildx-cache
mv -v /tmp/.buildx-cache-new /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- name: Deploy - name: Deploy
env: env:

View File

@ -1,5 +1,5 @@
use crate::backend::backup; use crate::backend::backup;
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Error, Result};
use log::{error, info}; use log::{error, info};
use sqlx::SqlitePool; use sqlx::SqlitePool;
use std::fs::{create_dir_all, remove_dir_all, File}; use std::fs::{create_dir_all, remove_dir_all, File};
@ -70,7 +70,6 @@ fn perform_backup(backup: backup::Backup) -> Result<()> {
.arg("all") .arg("all")
.env("MAILCOW_BACKUP_LOCATION", &tmp) .env("MAILCOW_BACKUP_LOCATION", &tmp)
.env("PATH", "/bin:/usr/bin:/host/usr/bin") .env("PATH", "/bin:/usr/bin:/host/usr/bin")
.current_dir(&dir)
.status()?; .status()?;
if !status.success() { if !status.success() {