mirror of
https://github.com/elseif/MikroTikPatch.git
synced 2026-08-26 02:04:50 +00:00
modified: .github/workflows/build_docker.yml
modified: index.html
This commit is contained in:
12
.github/workflows/build_docker.yml
vendored
12
.github/workflows/build_docker.yml
vendored
@@ -7,6 +7,11 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
force:
|
||||||
|
description: "Force rebuild even if version already exists"
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
packages: write
|
packages: write
|
||||||
@@ -62,10 +67,14 @@ jobs:
|
|||||||
id: filter_matrix
|
id: filter_matrix
|
||||||
env:
|
env:
|
||||||
IMAGE: "ghcr.io/${{ github.repository_owner }}/chr"
|
IMAGE: "ghcr.io/${{ github.repository_owner }}/chr"
|
||||||
|
FORCE: ${{ github.event.inputs.force == 'true' }}
|
||||||
run: |
|
run: |
|
||||||
MATRIX='${{ steps.get_versions.outputs.MATRIX }}'
|
MATRIX='${{ steps.get_versions.outputs.MATRIX }}'
|
||||||
|
if [ "$FORCE" = "true" ]; then
|
||||||
|
echo "Force mode enabled, skipping version existence check."
|
||||||
|
FILTERED="$MATRIX"
|
||||||
|
else
|
||||||
FILTERED='[]'
|
FILTERED='[]'
|
||||||
|
|
||||||
while read -r row; do
|
while read -r row; do
|
||||||
VERSION=$(echo "$row" | jq -r '.version')
|
VERSION=$(echo "$row" | jq -r '.version')
|
||||||
CHANNEL=$(echo "$row" | jq -r '.channel')
|
CHANNEL=$(echo "$row" | jq -r '.channel')
|
||||||
@@ -81,6 +90,7 @@ jobs:
|
|||||||
FILTERED=$(echo "$FILTERED" | jq -c --arg VERSION "$VERSION" --arg CHANNEL "$CHANNEL" '. + [{"version": $VERSION, "channel": $CHANNEL}]')
|
FILTERED=$(echo "$FILTERED" | jq -c --arg VERSION "$VERSION" --arg CHANNEL "$CHANNEL" '. + [{"version": $VERSION, "channel": $CHANNEL}]')
|
||||||
fi
|
fi
|
||||||
done < <(echo "$MATRIX" | jq -c '.[]')
|
done < <(echo "$MATRIX" | jq -c '.[]')
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Filtered matrix: $FILTERED"
|
echo "Filtered matrix: $FILTERED"
|
||||||
echo "MATRIX=$FILTERED" >> "$GITHUB_OUTPUT"
|
echo "MATRIX=$FILTERED" >> "$GITHUB_OUTPUT"
|
||||||
|
|||||||
10
index.html
10
index.html
@@ -442,9 +442,9 @@
|
|||||||
|
|
||||||
// Fetch latest version numbers from MikroTik servers
|
// Fetch latest version numbers from MikroTik servers
|
||||||
const loadingOverlay = document.getElementById("loading");
|
const loadingOverlay = document.getElementById("loading");
|
||||||
const [routeros7_stable, routeros7_testing, routeros6_longterm, routeros6_stable] = await Promise.all([
|
const [routeros7_stable, routeros7_longterm, routeros6_longterm, routeros6_stable] = await Promise.all([
|
||||||
fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.stable?ts=${Date.now()}`, "7.19.4"),
|
fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.stable?ts=${Date.now()}`, "7.19.4"),
|
||||||
fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.testing?ts=${Date.now()}`, "7.20rc1"),
|
fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWESTa7.long-term?ts=${Date.now()}`, "7.20rc1"),
|
||||||
fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWEST6.long-term?ts=${Date.now()}`, "6.49.18"),
|
fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWEST6.long-term?ts=${Date.now()}`, "6.49.18"),
|
||||||
fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWEST6.stable?ts=${Date.now()}`, "6.49.19"),
|
fetch_latest_versions(`https://upgrade.mikrotik.ltd/routeros/NEWEST6.stable?ts=${Date.now()}`, "6.49.19"),
|
||||||
]);
|
]);
|
||||||
@@ -456,7 +456,7 @@
|
|||||||
const downloads =[
|
const downloads =[
|
||||||
{
|
{
|
||||||
title:"RouterOS v7",
|
title:"RouterOS v7",
|
||||||
versions:[ { title:"Stable", version:routeros7_stable }, { title:"Testing", version:routeros7_testing } ],
|
versions:[ { title:"Long-Term", version:routeros7_longterm },{ title:"Stable", version:routeros7_stable } ],
|
||||||
groups: [
|
groups: [
|
||||||
{ title:"ARM64 / AMPERE", arch:"arm64", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"ISO image for AMPERE", type:"iso" } ] },
|
{ title:"ARM64 / AMPERE", arch:"arm64", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"ISO image for AMPERE", type:"iso" } ] },
|
||||||
{ title:"X86", arch:"x86", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"CD Image", type:"iso" }, { title:"Install image", type:"install" } ] },
|
{ title:"X86", arch:"x86", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"CD Image", type:"iso" }, { title:"Install image", type:"install" } ] },
|
||||||
@@ -472,7 +472,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title:"Cloud Hosted Router",
|
title:"Cloud Hosted Router",
|
||||||
versions:[ { title:"Long-Term", version:routeros6_longterm }, { title:"Stable", version:routeros6_stable }, { title:"Stable", version:routeros7_stable }, { title:"Testing", version:routeros7_testing } ],
|
versions:[ { title:"Long-Term", version:routeros6_longterm }, { title:"Stable", version:routeros6_stable }, { title:"Long-Term", version:routeros7_longterm }, { title:"Stable", version:routeros7_stable } ],
|
||||||
groups:[
|
groups:[
|
||||||
{ title:"X86", arch:"x86", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"VHDX image", type:"vhdx" }, { title:"VMDK image", type:"vmdk" }, { title:"VDI image", type:"vdi" }, { title:"VirtualPC image", type:"vhd" }, { title:"Raw disk image", type:"img" }, { title:"OVA template", type:"ova" } ] },
|
{ title:"X86", arch:"x86", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"VHDX image", type:"vhdx" }, { title:"VMDK image", type:"vmdk" }, { title:"VDI image", type:"vdi" }, { title:"VirtualPC image", type:"vhd" }, { title:"Raw disk image", type:"img" }, { title:"OVA template", type:"ova" } ] },
|
||||||
{ title:"ARM64 / AMPERE", arch:"arm64", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"VHDX image", type:"vhdx" }, { title:"VMDK image", type:"vmdk" }, { title:"VDI image", type:"vdi" }, { title:"VirtualPC image", type:"vhd" }, { title:"Raw disk image", type:"img" } ] }
|
{ title:"ARM64 / AMPERE", arch:"arm64", downloads:[ { title:"Main package", type:"main" }, { title:"Extra packages", type:"extra" }, { title:"VHDX image", type:"vhdx" }, { title:"VMDK image", type:"vmdk" }, { title:"VDI image", type:"vdi" }, { title:"VirtualPC image", type:"vhd" }, { title:"Raw disk image", type:"img" } ] }
|
||||||
@@ -709,8 +709,8 @@
|
|||||||
|
|
||||||
// Generate version selection buttons
|
// Generate version selection buttons
|
||||||
versionBtnsContainer.innerHTML = `
|
versionBtnsContainer.innerHTML = `
|
||||||
|
<button data-version="${routeros7_longterm}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Long-Term</button>
|
||||||
<button data-version="${routeros7_stable}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Stable</button>
|
<button data-version="${routeros7_stable}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Stable</button>
|
||||||
<button data-version="${routeros7_testing}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v7 Testing</button>
|
|
||||||
<button data-version="${routeros6_longterm}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v6 Long-Term</button>
|
<button data-version="${routeros6_longterm}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v6 Long-Term</button>
|
||||||
<button data-version="${routeros6_stable}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v6 Stable</button>
|
<button data-version="${routeros6_stable}" class="px-3 py-1.5 text-sm font-medium rounded-md hover:bg-blue-200 dark:hover:bg-gray-600 transition-all">v6 Stable</button>
|
||||||
`;
|
`;
|
||||||
|
|||||||
Reference in New Issue
Block a user