Merge branch 'main' into simon-engledew/fix-act-local

github · Nov 4, 2020 · df843a2 · df843a2
2 parents 1c8d72e + b6989db
commit df843a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/update-supported-enterprise-server-versions.yml b/.github/workflows/update-supported-enterprise-server-versions.yml
@@ -5,7 +5,7 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
-  multi-language-repo_test-autodetect-languages:
+  update-supported-enterprise-server-versions:
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.github/workflows/update-supported-enterprise-server-versions/update.py b/.github/workflows/update-supported-enterprise-server-versions/update.py
@@ -12,16 +12,18 @@
 _FIRST_SUPPORTED_RELEASE = semver.VersionInfo.parse("2.22.0") # Versions older than this did not include Code Scanning.
 
 def main():
+	api_compatibility_data = json.loads(_API_COMPATIBILITY_PATH.read_text())
+
 	releases = json.loads(_RELEASE_FILE_PATH.read_text())
 	oldest_supported_release = None
-	newest_supported_release = None
+	newest_supported_release = semver.VersionInfo.parse(api_compatibility_data["maximumVersion"] + ".0")
 
 	for release_version_string, release_data in releases.items():
 		release_version = semver.VersionInfo.parse(release_version_string + ".0")
 		if release_version < _FIRST_SUPPORTED_RELEASE:
 			continue
 
-		if newest_supported_release is None or release_version > newest_supported_release:
+		if release_version > newest_supported_release:
 			feature_freeze_date = datetime.date.fromisoformat(release_data["feature_freeze"])
 			if feature_freeze_date < datetime.date.today() + datetime.timedelta(weeks=2):
 				newest_supported_release = release_version