Compare commits

...
4 changed files with 8 additions and 7 deletions
+2 -2
View File
@@ -22,7 +22,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
- name: Pull Docker image from GHCR
run: docker pull ghcr.io/modrinth/daedalus:main
run: docker pull ghcr.io/modrinth/daedalus:fetch-daedalus
- name: Run Docker container
env:
@@ -48,4 +48,4 @@ jobs:
-e CLOUDFLARE_INTEGRATION=$CLOUDFLARE_INTEGRATION \
-e CLOUDFLARE_TOKEN=$CLOUDFLARE_TOKEN \
-e CLOUDFLARE_ZONE_ID=$CLOUDFLARE_ZONE_ID \
ghcr.io/modrinth/daedalus:main
ghcr.io/modrinth/daedalus:fetch-daedalus
+3 -2
View File
@@ -216,7 +216,9 @@ async fn fetch(
.await
.ok();
let fetch_versions = if let Some(modrinth_manifest) = modrinth_manifest {
let fetch_versions = if let Some(modrinth_manifest) = modrinth_manifest
&& mod_loader != "neo"
{
let mut fetch_versions = Vec::new();
for version in &forge_versions {
@@ -241,7 +243,6 @@ async fn fetch(
)
.await?;
#[tracing::instrument(skip(raw, upload_files, mirror_artifacts))]
async fn read_forge_installer(
raw: bytes::Bytes,
loader: &ForgeVersion,
+2 -2
View File
@@ -48,14 +48,14 @@ async fn main() -> Result<()> {
// path, mirror artifact
let mirror_artifacts: DashMap<String, MirrorArtifact> = DashMap::new();
forge::fetch_neo(semaphore.clone(), &upload_files, &mirror_artifacts)
.await?;
minecraft::fetch(semaphore.clone(), &upload_files, &mirror_artifacts)
.await?;
fabric::fetch_fabric(semaphore.clone(), &upload_files, &mirror_artifacts)
.await?;
fabric::fetch_quilt(semaphore.clone(), &upload_files, &mirror_artifacts)
.await?;
forge::fetch_neo(semaphore.clone(), &upload_files, &mirror_artifacts)
.await?;
forge::fetch_forge(semaphore.clone(), &upload_files, &mirror_artifacts)
.await?;
+1 -1
View File
@@ -34,7 +34,7 @@ where
serde_json::from_str::<DateTime<Utc>>(&format!("\"{s}\""))
.or_else(|_| {
NaiveDateTime::parse_from_str(&s, "%Y-%m-%dT%H:%M:%S%.9f")
NaiveDateTime::parse_from_str(&s, "%Y-%m-%dT%H:%M:%S%.f")
.map(|date| date.and_utc())
})
.map_err(serde::de::Error::custom)