Fix challenge config for branches

Author: Zahed-Riyaz

.github/workflows/validate-and-process.yml

@@ -4,8 +4,6 @@ on:
  push: {}
  pull_request:
  types: [opened, synchronize, reopened, edited]
- branches:
- - 'challenge'
 
 permissions:
  contents: read
@@ -32,23 +30,23 @@ jobs:
  echo "challenge_branch=$BRANCH" >> $GITHUB_OUTPUT
  
  # Check if this is a challenge branch
- if [[ "$BRANCH" =~ ^challenge(-.*)?$ ]]; then
+ if [[ "$BRANCH" =~ ^challenge(-[0-9]{4}-.*)?$ ]]; then
  echo "is_challenge_branch=true" >> $GITHUB_OUTPUT
  echo "✅ Valid challenge branch detected: $BRANCH"
  
  # Extract branch suffix for versioning
- if [[ "$BRANCH" =~ ^challenge-(.+)$ ]]; then
+ if [[ "$BRANCH" =~ ^challenge-([0-9]{4}-.+)$ ]]; then
  SUFFIX="${BASH_REMATCH[1]}"
  echo "branch_suffix=$SUFFIX" >> $GITHUB_OUTPUT
- echo "📋 Branch suffix: $SUFFIX"
+ echo "📋 Branch version: $SUFFIX"
  else
  echo "branch_suffix=main" >> $GITHUB_OUTPUT
  echo "📋 Main challenge branch (no suffix)"
  fi
  else
  echo "is_challenge_branch=false" >> $GITHUB_OUTPUT
  echo "ℹ️ Not a challenge branch: $BRANCH"
- echo "⏭️ Challenge processing will be skipped"
+ echo "⏭️ Challenge processing will be skipped (valid patterns: 'challenge' or 'challenge-YYYY-version')"
  fi
 
  validate-host-config:

README.md

@@ -48,8 +48,8 @@ If you are looking for a simple challenge configuration that you can replicate t
 
 5. Create a branch with name `challenge` in the forked repository from the `master` branch.
 <span style="color:purple">Note: Only changes in `challenge` branch will be synchronized with challenge on EvalAI.</span>
-You may maintain multiple versions by using additional branches whose names start with `challenge-` (e.g. `challenge-2024`, `challenge-v2`).
-<span style="color:purple">Note: The CI pipeline only runs for branches that match the pattern `challenge` or `challenge-*`. Any other branch name will be ignored.</span>
+You may maintain multiple versions by using additional branches that follow the pattern `challenge-<year>-<version>` (e.g. `challenge-2024-v1`, `challenge-2024-beta`, `challenge-2025-final`).
+<span style="color:purple">Note: The CI pipeline only runs for branches that match the pattern `challenge` or `challenge-YYYY-version`. Any other branch name will be ignored.</span>
 
 If you trigger the processing script manually and do **not** pass a branch argument, it will assume the branch name is `challenge` by default.
 

github/challenge_processing_script.py

@@ -8,6 +8,7 @@
 import config
 import urllib3
 from urllib.parse import urlparse
+import yaml
 
 from config import *
 from utils import (
@@ -49,8 +50,8 @@
 branch_name = args.branch_name if args.branch_name else "challenge"
 
 # Enforce branch naming convention
-if not re.match(r"^challenge(-.*)?$", branch_name):
- print("Error: Branch name must start with 'challenge' (e.g., 'challenge', 'challenge-2024').")
+if not re.match(r"^challenge(-\d{4}-.*)?$", branch_name):
+ print("Error: Branch name must follow the pattern 'challenge' or 'challenge-<year>-<version>' (e.g., 'challenge', 'challenge-2024-v1', 'challenge-2024-beta').")
  sys.exit(1)
 
 def is_localhost_url(url):
@@ -89,6 +90,58 @@ def configure_requests_for_localhost():
  print("INFO: SSL verification disabled for localhost development server")
 
 
+def modify_challenge_config_for_branch(branch_name):
+ """
+ Modify the challenge configuration to make it unique for each branch.
+ This ensures that different branches create separate challenges rather than updating the same one.
+ 
+ Arguments:
+ branch_name {str}: The name of the git branch
+ """
+ config_path = "challenge_config.yaml"
+ 
+ # Only modify if this is not the main challenge branch
+ if branch_name == "challenge":
+ print(f"📋 Using original challenge configuration (main branch)")
+ return
+ 
+ print(f"📋 Modifying challenge configuration for branch: {branch_name}")
+ 
+ try:
+ with open(config_path, 'r') as file:
+ config_data = yaml.safe_load(file)
+ 
+ # Extract year and version from branch name (challenge-YYYY-version)
+ branch_match = re.match(r"^challenge-(\d{4})-(.+)$", branch_name)
+ if branch_match:
+ year = branch_match.group(1)
+ version = branch_match.group(2)
+ suffix = f"{year}-{version}"
+ else:
+ # Fallback for any other format
+ suffix = branch_name.replace("challenge-", "")
+ 
+ # Modify the challenge title to include branch name
+ original_title = config_data.get('title', 'Challenge')
+ config_data['title'] = f"{original_title} ({suffix})"
+ 
+ # Modify short description to indicate this is a branch version
+ original_desc = config_data.get('short_description', '')
+ config_data['short_description'] = f"{original_desc} [Version: {suffix}]"
+ 
+ # Write the modified config back
+ with open(config_path, 'w') as file:
+ yaml.dump(config_data, file, default_flow_style=False)
+ 
+ print(f"✅ Challenge configuration modified:")
+ print(f" • Title: {config_data['title']}")
+ print(f" • Description: {config_data['short_description']}")
+ 
+ except Exception as e:
+ print(f"⚠️ Warning: Could not modify challenge configuration: {e}")
+ print(f" This may cause issues with branch-specific challenges")
+
+
 if __name__ == "__main__":
 
  configs = load_host_configs(HOST_CONFIG_FILE_PATH)
@@ -103,6 +156,9 @@ def configure_requests_for_localhost():
  # Update the global config path for zip file creation
  config.CHALLENGE_CONFIG_FILE_PATH = "challenge_config.yaml"
 
+ # Modify challenge configuration for branch-specific challenges
+ modify_challenge_config_for_branch(branch_name)
+ 
  # Check if we're using a localhost server and configure accordingly
  is_localhost = is_localhost_url(EVALAI_HOST_URL)
  runner_info = get_runner_info()
@@ -145,6 +201,12 @@ def configure_requests_for_localhost():
  if branch_name:
  data["BRANCH_NAME"] = branch_name
 
+ # Debug logging to show what data is being sent
+ print(f"\n📋 Request data being sent to EvalAI:")
+ print(f" • GITHUB_REPOSITORY: {data.get('GITHUB_REPOSITORY', 'Not set')}")
+ print(f" • BRANCH_NAME: {data.get('BRANCH_NAME', 'Not set')}")
+ print(f" • Challenge ZIP file: {CHALLENGE_ZIP_FILE_PATH}")
+
  # Configure SSL verification based on whether we're using localhost
  verify_ssl = not is_localhost
  print(f"🔒 SSL Verification: {'Disabled (localhost)' if not verify_ssl else 'Enabled'}")