Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/tempfile-3.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
0xJepsen committed Oct 28, 2023
2 parents c88e23e + 2b57acd commit 0247308
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 119 deletions.
22 changes: 1 addition & 21 deletions .github/workflows/book.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,24 +109,4 @@ jobs:
name: github-pages
path: ${{ runner.temp }}/artifact.tar
retention-days: 1
if-no-files-found: error

deploy:
# Only deploy if a push to main
if: github.ref_name == 'main' && github.event_name == 'push'
runs-on: ubuntu-latest
needs: [test, lint, build]

# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
permissions:
pages: write
id-token: write

environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
if-no-files-found: error
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
test:
name: test
runs-on: macos-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion arbiter-core/src/data_collection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ impl EventLogger {
/// directories or files, or writing to the files.
pub fn run(self) -> Result<(), RevmMiddlewareError> {
let receiver = self.receiver.unwrap();
let dir = self.directory.unwrap_or("./out".into());
let dir = self.directory.unwrap_or("./data".into());
let file_name = self.file_name.unwrap_or("output".into());
std::thread::spawn(move || {
let mut logs: BTreeMap<String, BTreeMap<String, Vec<Value>>> = BTreeMap::new();
Expand Down
94 changes: 0 additions & 94 deletions arbiter-core/src/tests/data_output.rs

This file was deleted.

1 change: 0 additions & 1 deletion arbiter-core/src/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// mod interaction;
mod clients;
mod contracts;
mod data_output;
mod derives;
mod environment_control;
mod middleware_instructions;
Expand Down
1 change: 0 additions & 1 deletion arbiter-core/src/tests/output_test.json

This file was deleted.

0 comments on commit 0247308

Please sign in to comment.