Skip to content

Commit 2db23d5

Browse files
committed
show in-progress build on build page and crate details page
1 parent 1e70e3f commit 2db23d5

6 files changed

+40
-17
lines changed

.sqlx/query-3cb4dcb5778c77148aeb8dfc7f942ad45269ad7aab9e9c08fdaa9cb218dbc752.json

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-e579486925d3d1927232675b2a03d5f8dd826d7136cdbba1331faf6e64c1f5eb.json renamed to .sqlx/query-771731efe02694173d758c04a4ec616e0171b05f09b71795af14270961fa8bd0.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/web/builds.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,24 @@ pub(crate) async fn build_list_json_handler(
9090
get_builds(&mut conn, &name, &version)
9191
.await?
9292
.iter()
93-
.map(|build| {
93+
.filter_map(|build| {
94+
if build.build_status == BuildStatus::InProgress {
95+
return None;
96+
}
9497
// for backwards compatibility in this API, we
9598
// * convert the build status to a boolean
9699
// * already filter out in-progress builds
97100
//
98101
// even when we start showing in-progress builds in the UI,
99102
// we might still not show them here for backwards
100103
// compatibility.
101-
serde_json::json!({
104+
Some(serde_json::json!({
102105
"id": build.id,
103106
"rustc_version": build.rustc_version,
104107
"docsrs_version": build.docsrs_version,
105108
"build_status": build.build_status.is_success(),
106109
"build_time": build.build_time,
107-
})
110+
}))
108111
})
109112
.collect::<Vec<_>>(),
110113
),

src/web/crate_details.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,7 @@ pub(crate) async fn releases_for_crate(
385385
FROM releases
386386
INNER JOIN release_build_status ON releases.id = release_build_status.rid
387387
WHERE
388-
releases.crate_id = $1 AND
389-
release_build_status.build_status != 'in_progress'"#,
388+
releases.crate_id = $1"#,
390389
crate_id,
391390
)
392391
.fetch(&mut *conn)

src/web/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ async fn match_version(
306306
};
307307

308308
// when matching semver requirements, we only want to look at non-yanked releases.
309-
let flt = |r: &&Release| r.yanked == Some(false);
309+
let flt = |r: &&Release| r.yanked.is_none() || r.yanked == Some(false);
310310

311311
if let Some(release) = releases
312312
.iter()

templates/crate/builds.html

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
<ul>
4343
{%- for build in builds -%}
4444
<li>
45+
{%- if build.build_status != "in_progress" %}
4546
<a href="/crate/{{ metadata.name }}/{{ metadata.version }}/builds/{{ build.id }}" class="release">
47+
{%- endif %}
4648
<div class="pure-g">
4749
<div class="pure-u-1 pure-u-sm-1-24 build">
4850
{%- if build.build_status == "success" -%}
@@ -77,19 +79,12 @@
7779
{%- endif -%}
7880
</div>
7981
</div>
82+
{%- if build.build_status != "in_progress" %}
8083
</a>
84+
{%- endif %}
8185
</li>
8286
{%- endfor -%}
8387
</ul>
84-
{%- else -%}
85-
{# FIXME: temporarily this will never be shown since we hide in-progress releases for now #}
86-
<div class="warning">
87-
docs.rs has not built {{ metadata.name }}-{{ metadata.version }}
88-
<br>
89-
It may still be <a href="/releases/queue">queued</a> or in-progress.
90-
<br>
91-
If you believe this is docs.rs' fault, <a href="https://github.com/rust-lang/docs.rs/issues/new/choose">open an issue</a>.
92-
</div>
9388
{%- endif -%}
9489

9590
<div class="about">

0 commit comments

Comments
 (0)