From 47885d7e78426b83504c8340fd54ba4f5baf5709 Mon Sep 17 00:00:00 2001 From: Steven Engler Date: Sun, 26 Jan 2025 18:46:16 -0500 Subject: [PATCH 1/5] Updated ci 'actions/checkout' from v2 to v4 --- .github/workflows/ci.yml | 8 ++++++-- .github/workflows/parse_and_plot.yml | 4 +++- .github/workflows/run_all_steps.yml | 16 +++++++++++----- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99904f4..26062f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + persist-credentials: false - name: Update packages run: sudo apt-get update @@ -51,7 +53,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + persist-credentials: false - name: Update packages run: sudo apt-get update diff --git a/.github/workflows/parse_and_plot.yml b/.github/workflows/parse_and_plot.yml index 2c558fb..9b3c9fa 100644 --- a/.github/workflows/parse_and_plot.yml +++ b/.github/workflows/parse_and_plot.yml @@ -20,7 +20,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + persist-credentials: false - name: Update packages run: sudo apt-get update diff --git a/.github/workflows/run_all_steps.yml b/.github/workflows/run_all_steps.yml index 79fb1c2..2a97a6b 100644 --- a/.github/workflows/run_all_steps.yml +++ b/.github/workflows/run_all_steps.yml @@ -43,7 +43,9 @@ jobs: RUSTPROFILE: minimal steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + persist-credentials: false - name: Update packages run: sudo apt-get update @@ -80,11 +82,12 @@ jobs: key: shadow-${{ env.SHADOW_COMMIT }}-${{ env.CACHE_VERSION }} - name: Checkout shadow - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: shadow/shadow ref: ${{ env.SHADOW_COMMIT }} path: shadow + persist-credentials: false - name: Install shadow deps run: | @@ -122,11 +125,12 @@ jobs: make install - name: Checkout tgen - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: shadow/tgen ref: ${{ env.TGEN_COMMIT }} path: tgen + persist-credentials: false - name: Build tgen deps run: sudo apt-get install -y cmake gcc libglib2.0-dev libigraph-dev make @@ -143,11 +147,12 @@ jobs: pip3 install -I ../tools - name: Checkout oniontrace - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: shadow/oniontrace ref: ${{ env.ONIONTRACE_COMMIT }} path: oniontrace + persist-credentials: false - name: Install oniontrace deps run: sudo apt-get install -y cmake gcc libglib2.0-0 libglib2.0-dev make @@ -184,10 +189,11 @@ jobs: find consensuses-*/ -type f | tail -n +100 | xargs rm - name: Checkout tmodel - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: tmodel-ccs2018/tmodel-ccs2018.github.io path: tmodel-ccs2018.github.io + persist-credentials: false - name: Install custom deps run: | From b60ba02024eaaa64a94797addfc152963feff080 Mon Sep 17 00:00:00 2001 From: Steven Engler Date: Sun, 26 Jan 2025 18:47:39 -0500 Subject: [PATCH 2/5] Updated ci 'actions/upload-artifact' from v2 to v4 --- .github/workflows/parse_and_plot.yml | 4 ++-- .github/workflows/run_all_steps.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/parse_and_plot.yml b/.github/workflows/parse_and_plot.yml index 9b3c9fa..271d75f 100644 --- a/.github/workflows/parse_and_plot.yml +++ b/.github/workflows/parse_and_plot.yml @@ -87,7 +87,7 @@ jobs: - name: Upload pdfs if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: pdfs path: pdfs @@ -96,7 +96,7 @@ jobs: # .github/workflows/parse_and_plot_output to a new expected output. - name: Upload plot data if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: parse_and_plot_output path: parse_and_plot_output/tornet.plot.data diff --git a/.github/workflows/run_all_steps.yml b/.github/workflows/run_all_steps.yml index 2a97a6b..7614a22 100644 --- a/.github/workflows/run_all_steps.yml +++ b/.github/workflows/run_all_steps.yml @@ -280,7 +280,7 @@ jobs: run: tornettools archive tornet - name: Upload tornet - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: tornet @@ -291,7 +291,7 @@ jobs: # necessary - e.g. when the output of the tgen or oniontrace parsers # changes in some significant way. - name: Upload parse_and_plot input - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: parse_and_plot_input path: | @@ -304,7 +304,7 @@ jobs: # Typically this is only needed when the output changes in some # significant way. - name: Upload plot data - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: run_all_steps_output path: | @@ -317,7 +317,7 @@ jobs: # the lines from the current run are not expected to be identical to the # lines from the previous run. - name: Upload plots - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: plots path: pdfs/*.pdf From e1c3571786c44ce2ea6dcb89d9a58ec7c667f37b Mon Sep 17 00:00:00 2001 From: Steven Engler Date: Sun, 26 Jan 2025 18:48:42 -0500 Subject: [PATCH 3/5] Updated ci 'actions/cache' from v2 to v4 --- .github/workflows/run_all_steps.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_all_steps.yml b/.github/workflows/run_all_steps.yml index 7614a22..6fbcad8 100644 --- a/.github/workflows/run_all_steps.yml +++ b/.github/workflows/run_all_steps.yml @@ -75,7 +75,7 @@ jobs: - name: Restore shadow build cache id: restore-shadow-build-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/opt/shadow @@ -107,7 +107,7 @@ jobs: - name: Restore tor build cache id: restore-tor-build-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/opt/tor @@ -170,7 +170,7 @@ jobs: - name: Restore net data cache id: restore-net-data-cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: netdata key: netdata-${{ env.NETDATA_MONTH }}-${{ env.NETDATA_LAST_DAY}}-${{ env.CACHE_VERSION }} From 9dbf54776e39bbc243ce98e13d3ccf64d9bc5bd0 Mon Sep 17 00:00:00 2001 From: Steven Engler Date: Sun, 26 Jan 2025 18:54:40 -0500 Subject: [PATCH 4/5] Added TODO note in 'cancel_prev_run_all_steps' workflow --- .github/workflows/cancel_prev_run_all_steps.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cancel_prev_run_all_steps.yml b/.github/workflows/cancel_prev_run_all_steps.yml index e3b7e3c..5bbcd5b 100644 --- a/.github/workflows/cancel_prev_run_all_steps.yml +++ b/.github/workflows/cancel_prev_run_all_steps.yml @@ -5,6 +5,9 @@ # instance to run at once per branch, canceling obsolete runs. # # Based on https://github.com/styfle/cancel-workflow-action#advanced-pull-requests-from-forks +# +# TODO: should we replace this with 'cancel-in-progress'? +# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/control-the-concurrency-of-workflows-and-jobs name: Cancel previous run-all-steps permissions: read-all on: From 14d6b0c973087bc7fd55fdfa635249d9d20cb111 Mon Sep 17 00:00:00 2001 From: Steven Engler Date: Sun, 26 Jan 2025 18:58:52 -0500 Subject: [PATCH 5/5] Fixed flake8 errors in python code --- tornettools/plot_common.py | 2 +- tornettools/util.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tornettools/plot_common.py b/tornettools/plot_common.py index 5371145..c4ef548 100644 --- a/tornettools/plot_common.py +++ b/tornettools/plot_common.py @@ -113,7 +113,7 @@ def __compute_sample_mean_and_error(bucket_list, confidence): resolution_variance = sum([res**2 for res in resolutions]) / 12 m, v = mean(emp_sample), var(emp_sample) - assert(k == len(emp_sample)) + assert k == len(emp_sample) s = sqrt(v + resolution_variance / k) e = z * s diff --git a/tornettools/util.py b/tornettools/util.py index b900bf9..9375967 100644 --- a/tornettools/util.py +++ b/tornettools/util.py @@ -49,7 +49,7 @@ def load_json_data(infile_path): return data def find_matching_files_in_dir(search_dir, filepattern): - if type(filepattern) == str: + if isinstance(filepattern, str): # Interpret as a literal string logging.info(f"Searching for files containing {filepattern} in directory tree at {search_dir}") filepattern = re.compile('.*' + re.escape(filepattern) + '.*') @@ -72,7 +72,7 @@ def find_matching_files_in_dir(search_dir, filepattern): # e.g.: # start_bytes = aka_int(2**20, 1048576) def aka_int(x, y): - assert(x == y) + assert x == y return x # Looks for the given data point, first in