mirrors/attic
1
0
Fork 0
mirror of https://github.com/zhaofengli/attic.git synced 2025-03-05 16:27:06 +00:00
Code Activity

Merge pull request #214 from girlbossceo/strawberry/send-nix-nar-content-type

Browse source
This commit is contained in:
Zhaofeng Li 2025-02-02 12:30:06 -07:00 • committed by GitHub
commit ff8a897d1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/build.yml vendored
View file

@ -35,10 +35,12 @@ jobs:
run: |
: "${ATTIC_SERVER:=https://staging.attic.rs/}"
: "${ATTIC_CACHE:=attic-ci}"
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
export PATH=$HOME/.nix-profile/bin:$PATH # FIXME
attic login --set-default ci "$ATTIC_SERVER" "$ATTIC_TOKEN"
attic use "$ATTIC_CACHE"
if [ -n "$ATTIC_TOKEN" ]; then
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
fi
env:
ATTIC_SERVER: ${{ secrets.ATTIC_SERVER }}
ATTIC_CACHE: ${{ secrets.ATTIC_CACHE }}
@ -97,10 +99,12 @@ jobs:
run: |
: "${ATTIC_SERVER:=https://staging.attic.rs/}"
: "${ATTIC_CACHE:=attic-ci}"
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
export PATH=$HOME/.nix-profile/bin:$PATH # FIXME
attic login --set-default ci "$ATTIC_SERVER" "$ATTIC_TOKEN"
attic use "$ATTIC_CACHE"
if [ -n "$ATTIC_TOKEN" ]; then
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
fi
env:
ATTIC_SERVER: ${{ secrets.ATTIC_SERVER }}
ATTIC_CACHE: ${{ secrets.ATTIC_CACHE }}
@ -152,10 +156,12 @@ jobs:
run: |
: "${ATTIC_SERVER:=https://staging.attic.rs/}"
: "${ATTIC_CACHE:=attic-ci}"
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
export PATH=$HOME/.nix-profile/bin:$PATH # FIXME
attic login --set-default ci "$ATTIC_SERVER" "$ATTIC_TOKEN"
attic use "$ATTIC_CACHE"
if [ -n "$ATTIC_TOKEN" ]; then
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
fi
env:
ATTIC_SERVER: ${{ secrets.ATTIC_SERVER }}
ATTIC_CACHE: ${{ secrets.ATTIC_CACHE }}
@ -197,10 +203,12 @@ jobs:
run: |
: "${ATTIC_SERVER:=https://staging.attic.rs/}"
: "${ATTIC_CACHE:=attic-ci}"
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
export PATH=$HOME/.nix-profile/bin:$PATH # FIXME
attic login --set-default ci "$ATTIC_SERVER" "$ATTIC_TOKEN"
attic use "$ATTIC_CACHE"
if [ -n "$ATTIC_TOKEN" ]; then
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
fi
env:
ATTIC_SERVER: ${{ secrets.ATTIC_SERVER }}
ATTIC_CACHE: ${{ secrets.ATTIC_CACHE }}
@ -246,10 +254,12 @@ jobs:
run: |
: "${ATTIC_SERVER:=https://staging.attic.rs/}"
: "${ATTIC_CACHE:=attic-ci}"
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
export PATH=$HOME/.nix-profile/bin:$PATH # FIXME
attic login --set-default ci "$ATTIC_SERVER" "$ATTIC_TOKEN"
attic use "$ATTIC_CACHE"
if [ -n "$ATTIC_TOKEN" ]; then
echo ATTIC_CACHE=$ATTIC_CACHE >>$GITHUB_ENV
fi
env:
ATTIC_SERVER: ${{ secrets.ATTIC_SERVER }}
ATTIC_CACHE: ${{ secrets.ATTIC_CACHE }}

19
server/src/api/binary_cache.rs
View file

@ -9,6 +9,7 @@ use std::io::{Error as IoError, ErrorKind as IoErrorKind};
use std::path::PathBuf;
use std::sync::Arc;
use axum::http;
use axum::{
body::Body,
extract::{Extension, Path},
@ -223,7 +224,14 @@ async fn get_nar(
});
let body = Body::from_stream(stream);
Ok(body.into_response())
Ok((
[(
http::header::CONTENT_TYPE,
http::HeaderValue::from_static(mime::NAR),
)],
body,
)
.into_response())
}
}
} else {
@ -260,7 +268,14 @@ async fn get_nar(
});
let body = Body::from_stream(merged);
Ok(body.into_response())
Ok((
[(
http::header::CONTENT_TYPE,
http::HeaderValue::from_static(mime::NAR),
)],
body,
)
.into_response())
}
}