Skip to content

Group nightly releases and limit to 10 nightlies per major #2328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions tabs/firmware_flasher.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,25 @@ TABS.firmware_flasher.initialize = function (callback) {
worker.postMessage(str);
}

function getReleaseMajor(releaseName) {
// "name":"inav-9.0.0-dev-20250124-28-d1ef85e82d8aa5bb8b85e518893c8e4f6ab61d6e"
var releaseNameExpression = /^inav-(\d+)([\d.]+)-(ci|dev)-(\d{4})(\d{2})(\d{2})-(\d+)-(\w+)$/;
var match = releaseNameExpression.exec(releaseName);

if(!match) {
console.log(releaseName + " not matched");
//alert(releaseName);
return 0;
}

return match[1];
}

function parseDevFilename(filename) {
//var targetFromFilenameExpression = /inav_([\d.]+)?_?([^.]+)\.(.*)/;
// inav_8.0.0_TUNERCF405_dev-20240617-88fb1d0.hex
// inav_8.0.0_TUNERCF405_ci-20240617-88fb1d0.hex
var targetFromFilenameExpression = /^inav_([\d.]+)_([A-Z0-9_]+)_(ci|dev)-(\d{4})(\d{2})(\d{2})-(\w+)\.(hex)$/;
var targetFromFilenameExpression = /^inav_(\d+)([\d.]+)_([A-Za-z0-9_]+)_(ci|dev)-(\d{4})(\d{2})(\d{2})-(\w+)\.(hex)$/;
var match = targetFromFilenameExpression.exec(filename);

if (!match) {
Expand All @@ -69,9 +83,11 @@ TABS.firmware_flasher.initialize = function (callback) {
}

return {
raw_target: match[2],
target: match[2].replace("_", " "),
format: match[8],
raw_target: match[3],
target: match[3].replace("_", " "),
format: match[9],
version: match[1]+match[2],
major: match[1]
};
}

Expand Down Expand Up @@ -151,14 +167,12 @@ TABS.firmware_flasher.initialize = function (callback) {
});

if (showDevReleases) {
var majorCount = {};
TABS.firmware_flasher.devReleasesData.forEach(function (release) {
release.assets.forEach(function (asset) {
var result = parseDevFilename(asset.name);

if ((!showDevReleases && release.prerelease) || !result) {
return;
}
if ($.inArray(result.target, unsortedTargets) == -1) {
if (result && $.inArray(result.target, unsortedTargets) == -1) {
unsortedTargets.push(result.target);
}
});
Expand Down Expand Up @@ -212,8 +226,20 @@ TABS.firmware_flasher.initialize = function (callback) {
});
});

if(showDevReleases) {
if(showDevReleases && TABS.firmware_flasher.devReleasesData) {
var majorCount = {};
TABS.firmware_flasher.devReleasesData.forEach(function(release){
var major = getReleaseMajor(release.name);

if (!(major in majorCount)) {
majorCount[major] = 0;
}

if(majorCount[major] >= 10) {
return;
}

majorCount[major]++;

var versionFromTagExpression = /v?(.*)/;
var matchVersionFromTag = versionFromTagExpression.exec(release.tag_name);
Expand Down Expand Up @@ -278,7 +304,7 @@ TABS.firmware_flasher.initialize = function (callback) {
return;
};

$.get('https://api.github.com/repos/iNavFlight/inav-nightly/releases?per_page=10', function(releasesData) {
$.get('https://api.github.com/repos/iNavFlight/inav-nightly/releases?per_page=50', function(releasesData) {
TABS.firmware_flasher.devReleasesData = releasesData;
}).fail(function (data){
TABS.firmware_flasher.devReleasesData = {};
Expand Down
Loading