From 82d9224466187443e9ba7b0fa0b0fbdcd0481186 Mon Sep 17 00:00:00 2001
From: Nathan Zimmerberg <39104088+nhz2@users.noreply.github.com>
Date: Tue, 16 Apr 2024 23:45:43 -0400
Subject: [PATCH] Log job and out_dir (#35)

* log job and out_dir

* improve help message

* update CI

* update CI
---
 .github/workflows/CI.yml |  9 +++++++--
 src/cli-parsing.jl       | 10 +++++-----
 src/run-sim.jl           |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 2b7204d..ee9dc1e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -22,7 +22,8 @@ jobs:
       matrix:
         version:
           - '1.9'
-          - '~1.10.0-0'
+          - '1.10'
+          - '~1.11.0-0'
           - 'nightly'
         os:
           - ubuntu-latest
@@ -30,9 +31,13 @@ jobs:
           - macos-latest
         arch:
           - x64
+        include:
+          - os: macOS-14
+            version: '1.10'
+            arch: aarch64
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
diff --git a/src/cli-parsing.jl b/src/cli-parsing.jl
index a03c7d7..7425020 100644
--- a/src/cli-parsing.jl
+++ b/src/cli-parsing.jl
@@ -16,13 +16,13 @@ const CLI_HELP = (
                             This directory will be created if it does not exist.
                             Defaults to the current working directory.
 
-        --batch=<job index>   Run just one of the jobs.
+        --batch=<job index> Run just one of the jobs.
                             By default all jobs will run.
 
-        --continue          Try to continue from existing snapshots
-                            in the output. By default, existing snapshots will
-                            be deleted, and the simulation will start from
-                            scratch.
+        --continue          Try to continue from existing trajectories
+                            in the output.
+                            By default existing trajectories will be deleted
+                            and the jobs will start from scratch.
 
         --help              Print out this message.
     """
diff --git a/src/run-sim.jl b/src/run-sim.jl
index 5edce14..8ed191b 100644
--- a/src/run-sim.jl
+++ b/src/run-sim.jl
@@ -130,7 +130,7 @@ function start_job(out_dir, job::String;
     job_out = mkpath(joinpath(abspath(out_dir), job))
     in_new_log_dir(job_out) do
         FileWatching.Pidfile.mkpidlock(joinpath(job_out,"traj.lock"); wait=false) do
-            @info "Starting new job."
+            @info "Starting new job." job out_dir
             @info get_version_string()
 
             # remove old snapshot data
@@ -189,7 +189,7 @@ function continue_job(out_dir, job;
     job_out = mkpath(joinpath(abspath(out_dir), job))
     traj = mkpath(joinpath(job_out, "traj"))
     in_new_log_dir(job_out) do
-        @info "Continuing job."
+        @info "Continuing job." job out_dir
         @info get_version_string()
         pidlock = try
             FileWatching.Pidfile.mkpidlock(joinpath(job_out,"traj.lock"); wait=false)