Skip to content

Commit

Permalink
Merge branch 'main' into dw/h-106-oss-series-post-1
Browse files Browse the repository at this point in the history
  • Loading branch information
vilkinsons authored Apr 29, 2024
2 parents 58b58d5 + 1fa6614 commit 0389c5e
Show file tree
Hide file tree
Showing 441 changed files with 29,179 additions and 9,036 deletions.
1 change: 1 addition & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"@apps/*",
"@blocks/*",
"@local/*",
"@rust/*",
"@tests/*",
"error-stack",
"deer"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/terraform-exec/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ inputs:
runs:
using: composite
steps:
- uses: hashicorp/setup-terraform@a1502cd9e758c50496cc9ac5308c4843bcd56d36 # v3.0.0
- uses: hashicorp/setup-terraform@97f030cf6dc0b4f5e0da352c7bca9cca34579800 # v3.1.0
with:
# pin until https://github.com/cyrilgdn/terraform-provider-postgresql/issues/357 is fixed
terraform_version: 1.5.7
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/warm-up-repo/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
# cache: yarn ## Currently disabled because of frequent timeouts

- name: Install WASM tools
uses: taiki-e/install-action@99774fec7fd4f75144bd0134a24a992297768308 # v2.32.17
uses: taiki-e/install-action@00a67321d66e038602baf558d366a594a7019ea2 # v2.33.9
with:
tool: [email protected]

Expand Down
23 changes: 11 additions & 12 deletions .github/scripts/rust/lint.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
//! ```cargo
//! [dependencies]
//! serde = {version = "*", features = ["derive"]}
//! toml = {version = "*", features = ["parse"]}
//! ```
#!/usr/bin/env -S cargo +nightly -Zscript
```cargo
[dependencies]
serde = {version = "*", features = ["derive"]}
toml = {version = "*", features = ["parse"]}
```

#![allow(non_snake_case)]

extern crate serde;
extern crate toml;

use std::{
collections::{BTreeSet, HashMap},
env, fs,
Expand Down Expand Up @@ -310,6 +308,7 @@ fn check(cwd: &Path) {

fn main() {
let mut args = env::args();

let mode = args
.by_ref()
.skip(1)
Expand All @@ -319,15 +318,15 @@ fn main() {
let cwd = args
.next()
.map(PathBuf::from)
.ok_or_else(env::current_dir)
.expect("unable to read working directory");
.map(Ok)
.unwrap_or_else(env::current_dir)
.expect("able to determine current working directory");

match mode.as_str() {
"generate" => generate(&cwd),
"check" => check(&cwd),
arg => panic!(
"unrecognized mode `{}`, available: `generate`, `check`",
arg
"unrecognized mode `{arg}`, available: `generate`, `check`"
),
};
}
Loading

0 comments on commit 0389c5e

Please sign in to comment.