From 2a21661f891ab6147f1e926a8c4aed93773ead97 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Thu, 16 Dec 2021 14:10:28 -0500 Subject: [PATCH 1/3] Copying the "archived/" directory from recipes-checker --- .github/workflows/callable-flex-update.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/callable-flex-update.yml b/.github/workflows/callable-flex-update.yml index 79129af38..e4a80b53b 100644 --- a/.github/workflows/callable-flex-update.yml +++ b/.github/workflows/callable-flex-update.yml @@ -47,5 +47,8 @@ jobs: git rm -q *.json mv .github/flex-endpoint/*.json . git add *.json + # merge in new archived files + for file in ../flex_endpoint/archived/*/*.json; do mv "$file" "archived/$(basename $(dirname "$file"))/$(basename "$file")"; done + git add archived/*/*.json git commit -m 'Update Flex endpoint' || true git push origin -f flex/main From f3f0d2c27a0a5793a1983eab54766054ee1eb46f Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 17 Dec 2021 08:53:53 -0500 Subject: [PATCH 2/3] making archived directory and fixing path --- .github/workflows/callable-flex-update.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/callable-flex-update.yml b/.github/workflows/callable-flex-update.yml index e4a80b53b..4701ef581 100644 --- a/.github/workflows/callable-flex-update.yml +++ b/.github/workflows/callable-flex-update.yml @@ -48,7 +48,8 @@ jobs: mv .github/flex-endpoint/*.json . git add *.json # merge in new archived files - for file in ../flex_endpoint/archived/*/*.json; do mv "$file" "archived/$(basename $(dirname "$file"))/$(basename "$file")"; done + mkdir -p archived + for file in .github/flex-endpoint/archived/*/*.json; do mv "$file" "archived/$(basename $(dirname "$file"))/$(basename "$file")"; done git add archived/*/*.json git commit -m 'Update Flex endpoint' || true git push origin -f flex/main From fdfc5bfdd5e7e6f263025261204c0dd11ca8c489 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 17 Dec 2021 09:30:03 -0500 Subject: [PATCH 3/3] Much simpler now! --- .github/workflows/callable-flex-update.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/callable-flex-update.yml b/.github/workflows/callable-flex-update.yml index 4701ef581..cb0159bbd 100644 --- a/.github/workflows/callable-flex-update.yml +++ b/.github/workflows/callable-flex-update.yml @@ -47,9 +47,7 @@ jobs: git rm -q *.json mv .github/flex-endpoint/*.json . git add *.json - # merge in new archived files - mkdir -p archived - for file in .github/flex-endpoint/archived/*/*.json; do mv "$file" "archived/$(basename $(dirname "$file"))/$(basename "$file")"; done - git add archived/*/*.json + cp -a .github/flex-endpoint/archived . + git add archived/ git commit -m 'Update Flex endpoint' || true git push origin -f flex/main