From 87d03e0dd2691d933be7ae4bcfdcb81ea53917c9 Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Mon, 26 Aug 2024 17:59:30 -0400 Subject: [PATCH 1/5] Revert back to previous secret code This (partially) reverts commit 77b80a09d38eab272fb406856e9f4d02b924d0c1. --- .github/workflows/run.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run.yaml b/.github/workflows/run.yaml index f8f053c..a004eab 100644 --- a/.github/workflows/run.yaml +++ b/.github/workflows/run.yaml @@ -83,10 +83,12 @@ jobs: - name: Run benchmarks env: - OE_LICENSE: ${{ github.workspace }}/oe_license.txt + LICENSE: ${{ secrets.OELICENSE }} shell: bash -l {0} run: | set -e + echo "$LICENSE" > /tmp/oe_license.txt + export OE_LICENSE=/tmp/oe_license.txt python main.py ${{ inputs.path }} $(nproc) - name: Commit results From f93154f187021e120c954e97152c40335d7a57d0 Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Mon, 26 Aug 2024 18:00:38 -0400 Subject: [PATCH 2/5] ignore oe_license.txt --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6bb3799 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +oe_license.txt \ No newline at end of file From 3ef91abf5d994291640e7de25f0e11680f7b769d Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Mon, 26 Aug 2024 18:01:59 -0400 Subject: [PATCH 3/5] update path to organization OE_LICENSE --- .github/workflows/run.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yaml b/.github/workflows/run.yaml index a004eab..b837a47 100644 --- a/.github/workflows/run.yaml +++ b/.github/workflows/run.yaml @@ -83,7 +83,7 @@ jobs: - name: Run benchmarks env: - LICENSE: ${{ secrets.OELICENSE }} + LICENSE: ${{ secrets.OE_LICENSE }} shell: bash -l {0} run: | set -e From 36351d81c34a99a61ccb2977b4fe028133d69758 Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Mon, 26 Aug 2024 18:03:51 -0400 Subject: [PATCH 4/5] remove the license before performing any git operations --- .github/workflows/run.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run.yaml b/.github/workflows/run.yaml index b837a47..d28bf8c 100644 --- a/.github/workflows/run.yaml +++ b/.github/workflows/run.yaml @@ -90,6 +90,7 @@ jobs: echo "$LICENSE" > /tmp/oe_license.txt export OE_LICENSE=/tmp/oe_license.txt python main.py ${{ inputs.path }} $(nproc) + rm $OE_LICENSE - name: Commit results shell: bash -l {0} From 59c333f92e9c16fe638c86886b1f089bd78b028d Mon Sep 17 00:00:00 2001 From: Brent Westbrook Date: Mon, 26 Aug 2024 18:45:33 -0400 Subject: [PATCH 5/5] git add only the output csv files instead of . there are three assumptions encoded here that are shared with `main.py`. first, the output is expected to be written in the same directory as the input YAML file; second, the output subdirectory is expected to be called `output`; and third, the desired output files are `dde.csv`, `icrmsd.csv`, `rmsd.csv`, and `tfd.csv` --- .github/workflows/run.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run.yaml b/.github/workflows/run.yaml index d28bf8c..e7722a9 100644 --- a/.github/workflows/run.yaml +++ b/.github/workflows/run.yaml @@ -100,7 +100,10 @@ jobs: git config --global init.defaultBranch main # Commit the benchmark results and push - git add . + + input_file=${{ inputs.path }} # path to the input YAML file + input_dir=$(dirname $input_file) # parent directory of input YAML file + git add $input_dir/output/{dde,icrmsd,rmsd,tfd}.csv # add only the output CSV files git commit -m "Add benchmark results" git push