From 0dfcebb828a62fe1ade10021f95c9632d123af0e Mon Sep 17 00:00:00 2001 From: AyushR1 Date: Thu, 24 Aug 2023 02:52:41 +0530 Subject: [PATCH 1/2] Add support for challenge multiple versions Signed-off-by: AyushR1 --- .github/workflows/process_challenge.yml | 8 +++----- github/challenge_processing_script.py | 7 ++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/process_challenge.yml b/.github/workflows/process_challenge.yml index f3964c81c..2fada90da 100644 --- a/.github/workflows/process_challenge.yml +++ b/.github/workflows/process_challenge.yml @@ -3,11 +3,9 @@ name: evalai-challenge on: - push: - branches: [challenge] + push: {} pull_request: types: [opened, synchronize, reopened, edited] - branches: [challenge] jobs: build: runs-on: ubuntu-20.04 @@ -23,14 +21,14 @@ jobs: if [ -f github/requirements.txt ]; then pip install -r github/requirements.txt; fi - name: Validate challenge run: | - python3 github/challenge_processing_script.py + python3 github/challenge_processing_script.py ${GITHUB_REF#refs/heads/} env: IS_VALIDATION: 'True' GITHUB_CONTEXT: ${{ toJson(github) }} GITHUB_AUTH_TOKEN: ${{ secrets.AUTH_TOKEN }} - name: Create or update challenge run: | - python3 github/challenge_processing_script.py + python3 github/challenge_processing_script.py ${GITHUB_REF#refs/heads/} if: ${{github.event_name == 'push' && success()}} env: IS_VALIDATION: 'False' diff --git a/github/challenge_processing_script.py b/github/challenge_processing_script.py index b0c88bb98..1e67d5d09 100644 --- a/github/challenge_processing_script.py +++ b/github/challenge_processing_script.py @@ -62,7 +62,12 @@ zip_file = open(CHALLENGE_ZIP_FILE_PATH, "rb") file = {"zip_configuration": zip_file} - data = {"GITHUB_REPOSITORY": GITHUB_REPOSITORY} + github_branch = sys.argv[1] if len(sys.argv) > 1 else "challenge" + + data = { + "GITHUB_REPOSITORY": "ssss", + "GITHUB_BRANCH": github_branch, + } try: response = requests.post(url, data=data, headers=headers, files=file) From beda4755ab64c2169cfc26550c05bf4b9d7aa50d Mon Sep 17 00:00:00 2001 From: AyushR1 Date: Tue, 29 Aug 2023 17:37:12 +0530 Subject: [PATCH 2/2] Fix Signed-off-by: AyushR1 --- github/challenge_processing_script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github/challenge_processing_script.py b/github/challenge_processing_script.py index 1e67d5d09..19022f121 100644 --- a/github/challenge_processing_script.py +++ b/github/challenge_processing_script.py @@ -65,7 +65,7 @@ github_branch = sys.argv[1] if len(sys.argv) > 1 else "challenge" data = { - "GITHUB_REPOSITORY": "ssss", + "GITHUB_REPOSITORY": GITHUB_REPOSITORY, "GITHUB_BRANCH": github_branch, }