Skip to content
This repository has been archived by the owner on Oct 11, 2023. It is now read-only.

Commit

Permalink
Bump ci-linux image for rust 1.68 (#411)
Browse files Browse the repository at this point in the history
* Fix the trivial warning first

* fix(merge_request): avoid clippy warning pending a proper fix

fixes #412
closes #413

* Bump ci-linux image for rust 1.68

---------

Co-authored-by: rzadp <roopert7@gmail.com>
  • Loading branch information
Mira Ressel and rzadp authored Mar 20, 2023
1 parent 228942a commit 58dea97
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variables:
KUBE_NAMESPACE: "processbot"
CI_REGISTRY: "paritytech"
BUILDAH_IMAGE: "quay.io/buildah/stable:v1.27"
CI_IMAGE: "paritytech/ci-linux@sha256:05ece6bd39131e35868babf911d19b7b570134d47b0455076ab162b233ed4157"
CI_IMAGE: "paritytech/ci-linux@sha256:7c76c3f9639f919447abbf9db535588178fde4df583d6926444d44cc20c094e6" # staging 2023-03-20
GIT_STRATEGY: fetch
GIT_DEPTH: 3
CARGO_TARGET_DIR: "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
Expand Down
2 changes: 1 addition & 1 deletion src/github/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ impl GithubClient {

async fn execute(&self, builder: RequestBuilder) -> Result<Response> {
let request = builder
.bearer_auth(&self.auth_token().await?)
.bearer_auth(self.auth_token().await?)
.header(
header::ACCEPT,
"application/vnd.github.starfox-preview+json",
Expand Down
3 changes: 2 additions & 1 deletion src/merge_request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ pub async fn cleanup_merge_request(
MergeRequestCleanupReason::Error
| MergeRequestCleanupReason::Cancelled => {
for dependent in related_dependents.values() {
let _ = cleanup_merge_request(
// TODO: these cleanup_merge_request() might not be actually executed rn, poll them?
let _result = cleanup_merge_request(
state,
&dependent.sha,
&dependent.owner,
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pub fn initialize_repository(repo_dir: &Path, initial_branch: &str) {
Some(repo_dir),
None,
);
fs::write(&repo_dir.join("README"), "").unwrap();
fs::write(repo_dir.join("README"), "").unwrap();
exec("git", &["add", "."], Some(&repo_dir), None);
exec(
"git",
Expand Down

0 comments on commit 58dea97

Please sign in to comment.