kaiyga/MikroTikPatch
1
0
Fork 0
mirror of https://github.com/elseif/MikroTikPatch synced 2026-07-17 18:49:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

modified: .github/workflows/main.yml

Browse Source 
renamed:    .github/workflows/build_v6.yml -> .github/workflows/patch_v6.yml
	renamed:    .github/workflows/build_v7.yml -> .github/workflows/patch_v7.yml
This commit is contained in:
elseif 2026-07-14 18:26:29 +08:00
parent b7ef8c8304
commit d95c1523f1
3 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/main.yml vendored
View File

@ -6,35 +6,35 @@ on:
workflow_dispatch: workflow_dispatch:
jobs: jobs:
Build_Stable: Patch_Stable:
uses: ./.github/workflows/build_v7.yml uses: ./.github/workflows/build_v7.yml
with: with:
channel: stable channel: stable
release: true release: true
secrets: inherit secrets: inherit
Build_LongTerm: Patch_LongTerm:
uses: ./.github/workflows/build_v7.yml uses: ./.github/workflows/build_v7.yml
with: with:
channel: long-term channel: long-term
release: true release: true
secrets: inherit secrets: inherit
Build_Testing: Patch_Testing:
uses: ./.github/workflows/build_v7.yml uses: ./.github/workflows/build_v7.yml
with: with:
channel: testing channel: testing
release: true release: true
secrets: inherit secrets: inherit
Build_Stable_V6: Patch_Stable_V6:
uses: ./.github/workflows/build_v6.yml uses: ./.github/workflows/build_v6.yml
with: with:
channel: stable channel: stable
release: true release: true
secrets: inherit secrets: inherit
Build_LongTerm_V6: Patch_LongTerm_V6:
uses: ./.github/workflows/build_v6.yml uses: ./.github/workflows/build_v6.yml
with: with:
channel: long-term channel: long-term

42
.github/workflows/build_v6.yml → .github/workflows/patch_v6.yml vendored
View File

@ -1,4 +1,4 @@
name: Build RouterOS v6 name: Patch RouterOS v6
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
@ -63,7 +63,7 @@ env:
jobs: jobs:
Prepare_Build: Prepare_Patch:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
outputs: outputs:
VERSION: ${{ steps.prepare.outputs.VERSION }} VERSION: ${{ steps.prepare.outputs.VERSION }}
@ -72,7 +72,7 @@ jobs:
RELEASE: ${{ steps.prepare.outputs.RELEASE }} RELEASE: ${{ steps.prepare.outputs.RELEASE }}
SKIP_BUILD: ${{ steps.prepare.outputs.SKIP_BUILD }} SKIP_BUILD: ${{ steps.prepare.outputs.SKIP_BUILD }}
steps: steps:
- name: Prepare Build for ${{ inputs.channel }} - name: Prepare Patch for ${{ inputs.channel }}
id: prepare id: prepare
run: | run: |
CHANNEL="${{ inputs.channel }}" CHANNEL="${{ inputs.channel }}"
@ -109,21 +109,21 @@ jobs:
Build_RouterOS: Build_RouterOS:
needs: Prepare_Build needs: Prepare_Patch
if: needs.Prepare_Build.outputs.SKIP_BUILD == 'false' if: needs.Prepare_Patch.outputs.SKIP_BUILD == 'false'
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
strategy: strategy:
matrix: matrix:
arch: ${{ fromJson(needs.Prepare_Build.outputs.ARCHS) }} arch: ${{ fromJson(needs.Prepare_Patch.outputs.ARCHS) }}
fail-fast: false fail-fast: false
env: env:
TZ: 'Asia/Shanghai' TZ: 'Asia/Shanghai'
CHANNEL: ${{ inputs.channel }} CHANNEL: ${{ inputs.channel }}
ARCH: ${{ matrix.arch }} ARCH: ${{ matrix.arch }}
VERSION: ${{ needs.Prepare_Build.outputs.VERSION }} VERSION: ${{ needs.Prepare_Patch.outputs.VERSION }}
BUILD_TIME: ${{ needs.Prepare_Build.outputs.BUILD_TIME }} BUILD_TIME: ${{ needs.Prepare_Patch.outputs.BUILD_TIME }}
BUILD_DIR: "/tmp/build/${{ needs.Prepare_Build.outputs.VERSION }}" BUILD_DIR: "/tmp/build/${{ needs.Prepare_Patch.outputs.VERSION }}"
PUBLISH_DIR: "${{ github.workspace }}/publish/${{ needs.Prepare_Build.outputs.VERSION }}" PUBLISH_DIR: "${{ github.workspace }}/publish/${{ needs.Prepare_Patch.outputs.VERSION }}"
ARCH_EXT: "" ARCH_EXT: ""
PACKAGES: "" PACKAGES: ""
steps: steps:
@ -211,7 +211,6 @@ jobs:
} }
] ]
EOF EOF
sudo apt-get install python3-crcmod > /dev/null
HASH=$(python3 -E <<EOF HASH=$(python3 -E <<EOF
import hashlib, crcmod, sys import hashlib, crcmod, sys
with open('$BUILD_DIR/option.jg','rb') as f: with open('$BUILD_DIR/option.jg','rb') as f:
@ -260,7 +259,6 @@ jobs:
mkdir -p $BUILD_DIR/new_iso mkdir -p $BUILD_DIR/new_iso
sudo mount -o loop,ro $BUILD_DIR/mikrotik-$VERSION$ARCH_EXT.iso $BUILD_DIR/iso sudo mount -o loop,ro $BUILD_DIR/mikrotik-$VERSION$ARCH_EXT.iso $BUILD_DIR/iso
cp -r $BUILD_DIR/iso/* $BUILD_DIR/new_iso/ cp -r $BUILD_DIR/iso/* $BUILD_DIR/new_iso/
rsync -a $BUILD_DIR/iso/ $BUILD_DIR/new_iso/
mv $BUILD_DIR/new_iso/*.npk $BUILD_DIR/all_packages/ mv $BUILD_DIR/new_iso/*.npk $BUILD_DIR/all_packages/
mv $BUILD_DIR/all_packages/system-$VERSION$ARCH_EXT.npk $BUILD_DIR/ mv $BUILD_DIR/all_packages/system-$VERSION$ARCH_EXT.npk $BUILD_DIR/
sudo umount $BUILD_DIR/iso sudo umount $BUILD_DIR/iso
@ -419,7 +417,7 @@ jobs:
rm $BUILD_DIR/chr-$VERSION$ARCH_EXT.* rm $BUILD_DIR/chr-$VERSION$ARCH_EXT.*
- name: Upload Files as Artifact (No Release) - name: Upload Files as Artifact (No Release)
if: needs.Prepare_Build.outputs.RELEASE == 'false' if: needs.Prepare_Patch.outputs.RELEASE == 'false'
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
with: with:
name: mikrotik-${{ env.VERSION }}${{ env.ARCH_EXT }} name: mikrotik-${{ env.VERSION }}${{ env.ARCH_EXT }}
@ -428,7 +426,7 @@ jobs:
${{ env.PUBLISH_DIR }}/*.iso ${{ env.PUBLISH_DIR }}/*.iso
- name: Generate SHA256 checksum files - name: Generate SHA256 checksum files
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
( (
cd $PUBLISH_DIR cd $PUBLISH_DIR
@ -441,7 +439,7 @@ jobs:
) )
- name: Delete Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }} - name: Delete Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }}
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
sed -i "1i Build Time:$BUILD_TIME" $PUBLISH_DIR/CHANGELOG sed -i "1i Build Time:$BUILD_TIME" $PUBLISH_DIR/CHANGELOG
HEADER="Authorization: token ${{ secrets.GITHUB_TOKEN }}" HEADER="Authorization: token ${{ secrets.GITHUB_TOKEN }}"
@ -460,7 +458,7 @@ jobs:
fi fi
- name: Create Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }} - name: Create Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }}
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
uses: softprops/action-gh-release@v3 uses: softprops/action-gh-release@v3
with: with:
name: "RouterOS ${{ env.VERSION }}${{ env.ARCH_EXT }}" name: "RouterOS ${{ env.VERSION }}${{ env.ARCH_EXT }}"
@ -477,7 +475,7 @@ jobs:
${{env.PUBLISH_DIR}}/*.iso.sha256 ${{env.PUBLISH_DIR}}/*.iso.sha256
- name: Upload Files - name: Upload Files
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
sudo apt-get install -y knockd lftp > /dev/null sudo apt-get install -y knockd lftp > /dev/null
knock -4 ${{ secrets.SSH_SERVER }} ${{ secrets.SSH_KNOCK_PORT }} knock -4 ${{ secrets.SSH_SERVER }} ${{ secrets.SSH_KNOCK_PORT }}
@ -513,7 +511,7 @@ jobs:
EOF EOF
- name: Clear Cloudflare cache - name: Clear Cloudflare cache
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
curl --request POST --url "https://api.cloudflare.com/client/v4/zones/096723464400de10b6eb85028baa8372/purge_cache" \ curl --request POST --url "https://api.cloudflare.com/client/v4/zones/096723464400de10b6eb85028baa8372/purge_cache" \
--header "Authorization: Bearer 9GDQkzU51QXaqzp1qMjyFKpyeJyOdnNoG9GZQaGP" \ --header "Authorization: Bearer 9GDQkzU51QXaqzp1qMjyFKpyeJyOdnNoG9GZQaGP" \
@ -522,15 +520,15 @@ jobs:
Update_Release: Update_Release:
needs: [Prepare_Build,Build_RouterOS] needs: [Prepare_Patch,Build_RouterOS]
if: | if: |
needs.Prepare_Build.outputs.SKIP_BUILD == 'false' && needs.Prepare_Patch.outputs.SKIP_BUILD == 'false' &&
needs.Build_RouterOS.result == 'success' && needs.Build_RouterOS.result == 'success' &&
needs.Prepare_Build.outputs.RELEASE == 'true' needs.Prepare_Patch.outputs.RELEASE == 'true'
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
env: env:
CHANNEL: ${{ inputs.channel }} CHANNEL: ${{ inputs.channel }}
VERSION: ${{ needs.Prepare_Build.outputs.VERSION }} VERSION: ${{ needs.Prepare_Patch.outputs.VERSION }}
steps: steps:
- name: Update Release - name: Update Release
run: | run: |

46
.github/workflows/build_v7.yml → .github/workflows/patch_v7.yml vendored
View File

@ -1,4 +1,4 @@
name: Build RouterOS v7 name: Patch RouterOS v7
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
@ -77,7 +77,7 @@ env:
CUSTOM_CLOUD_URL: ${{ secrets.CUSTOM_CLOUD_URL }} CUSTOM_CLOUD_URL: ${{ secrets.CUSTOM_CLOUD_URL }}
jobs: jobs:
Prepare_Build: Prepare_Patch:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
outputs: outputs:
VERSION: ${{ steps.prepare.outputs.VERSION }} VERSION: ${{ steps.prepare.outputs.VERSION }}
@ -86,7 +86,7 @@ jobs:
RELEASE: ${{ steps.prepare.outputs.RELEASE }} RELEASE: ${{ steps.prepare.outputs.RELEASE }}
SKIP_BUILD: ${{ steps.prepare.outputs.SKIP_BUILD }} SKIP_BUILD: ${{ steps.prepare.outputs.SKIP_BUILD }}
steps: steps:
- name: Prepare Build for ${{ inputs.channel }} - name: Prepare Patch for ${{ inputs.channel }}
id: prepare id: prepare
run: | run: |
CHANNEL="${{ inputs.channel }}" CHANNEL="${{ inputs.channel }}"
@ -128,21 +128,21 @@ jobs:
echo "Version: $VERSION, Archs: $ARCHS" echo "Version: $VERSION, Archs: $ARCHS"
Build_RouterOS: Build_RouterOS:
needs: Prepare_Build needs: Prepare_Patch
if: needs.Prepare_Build.outputs.SKIP_BUILD == 'false' if: needs.Prepare_Patch.outputs.SKIP_BUILD == 'false'
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
strategy: strategy:
matrix: matrix:
arch: ${{ fromJson(needs.Prepare_Build.outputs.ARCHS) }} arch: ${{ fromJson(needs.Prepare_Patch.outputs.ARCHS) }}
fail-fast: false fail-fast: false
env: env:
TZ: 'Asia/Shanghai' TZ: 'Asia/Shanghai'
CHANNEL: ${{ inputs.channel }} CHANNEL: ${{ inputs.channel }}
ARCH: ${{ matrix.arch }} ARCH: ${{ matrix.arch }}
VERSION: ${{ needs.Prepare_Build.outputs.VERSION }} VERSION: ${{ needs.Prepare_Patch.outputs.VERSION }}
BUILD_TIME: ${{ needs.Prepare_Build.outputs.BUILD_TIME }} BUILD_TIME: ${{ needs.Prepare_Patch.outputs.BUILD_TIME }}
BUILD_DIR: "/tmp/build/${{ needs.Prepare_Build.outputs.VERSION }}" BUILD_DIR: "/tmp/build/${{ needs.Prepare_Patch.outputs.VERSION }}"
PUBLISH_DIR: "${{ github.workspace }}/publish/${{ needs.Prepare_Build.outputs.VERSION }}" PUBLISH_DIR: "${{ github.workspace }}/publish/${{ needs.Prepare_Patch.outputs.VERSION }}"
ARCH_EXT: "" ARCH_EXT: ""
PACKAGES: "" PACKAGES: ""
steps: steps:
@ -328,7 +328,7 @@ jobs:
rm -rf $BUILD_DIR/all_packages rm -rf $BUILD_DIR/all_packages
- name: Cache NetInstall ${{ env.VERSION }} - name: Cache NetInstall ${{ env.VERSION }}
if: matrix.arch == 'x86' && needs.Prepare_Build.outputs.RELEASE == 'true' if: matrix.arch == 'x86' && needs.Prepare_Patch.outputs.RELEASE == 'true'
id: cache-netinstall id: cache-netinstall
uses: actions/cache@v5 uses: actions/cache@v5
with: with:
@ -338,12 +338,12 @@ jobs:
- name: Get netinstall ${{ env.VERSION }} - name: Get netinstall ${{ env.VERSION }}
if: | if: |
steps.cache-netinstall.outputs.cache-hit != 'true' && steps.cache-netinstall.outputs.cache-hit != 'true' &&
matrix.arch == 'x86' && needs.Prepare_Build.outputs.RELEASE == 'true' matrix.arch == 'x86' && needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
wget -nv -O $BUILD_DIR/netinstall-$VERSION.zip https://download.mikrotik.com/routeros/$VERSION/netinstall-$VERSION.zip wget -nv -O $BUILD_DIR/netinstall-$VERSION.zip https://download.mikrotik.com/routeros/$VERSION/netinstall-$VERSION.zip
- name: Patch netinstall ${{ env.VERSION }} - name: Patch netinstall ${{ env.VERSION }}
if: matrix.arch == 'x86' && needs.Prepare_Build.outputs.RELEASE == 'true' if: matrix.arch == 'x86' && needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
unzip $BUILD_DIR/netinstall-$VERSION.zip -d $BUILD_DIR/ unzip $BUILD_DIR/netinstall-$VERSION.zip -d $BUILD_DIR/
python3 patch.py netinstall $BUILD_DIR/netinstall.exe python3 patch.py netinstall $BUILD_DIR/netinstall.exe
@ -838,7 +838,7 @@ jobs:
rm -rf $BUILD_DIR/chr rm -rf $BUILD_DIR/chr
- name: Upload Files as Artifact (No Release) - name: Upload Files as Artifact (No Release)
if: needs.Prepare_Build.outputs.RELEASE == 'false' if: needs.Prepare_Patch.outputs.RELEASE == 'false'
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
with: with:
name: mikrotik-${{ env.VERSION }}${{ env.ARCH_EXT }} name: mikrotik-${{ env.VERSION }}${{ env.ARCH_EXT }}
@ -847,7 +847,7 @@ jobs:
${{ env.PUBLISH_DIR }}/*.iso ${{ env.PUBLISH_DIR }}/*.iso
- name: Generate SHA256 checksum files - name: Generate SHA256 checksum files
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
( (
cd $PUBLISH_DIR cd $PUBLISH_DIR
@ -860,7 +860,7 @@ jobs:
) )
- name: Delete Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }} - name: Delete Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }}
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
sed -i "1i Build Time:$BUILD_TIME" $PUBLISH_DIR/CHANGELOG sed -i "1i Build Time:$BUILD_TIME" $PUBLISH_DIR/CHANGELOG
HEADER="Authorization: token ${{ secrets.GITHUB_TOKEN }}" HEADER="Authorization: token ${{ secrets.GITHUB_TOKEN }}"
@ -879,7 +879,7 @@ jobs:
fi fi
- name: Create Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }} - name: Create Release tag ${{ env.VERSION }}${{ env.ARCH_EXT }}
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
uses: softprops/action-gh-release@v3 uses: softprops/action-gh-release@v3
with: with:
name: "RouterOS ${{ env.VERSION }}${{ env.ARCH_EXT }}" name: "RouterOS ${{ env.VERSION }}${{ env.ARCH_EXT }}"
@ -896,7 +896,7 @@ jobs:
${{env.PUBLISH_DIR}}/*.iso.sha256 ${{env.PUBLISH_DIR}}/*.iso.sha256
- name: Upload Files - name: Upload Files
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
sudo apt-get install -y knockd lftp > /dev/null sudo apt-get install -y knockd lftp > /dev/null
knock -4 ${{ secrets.SSH_SERVER }} ${{ secrets.SSH_KNOCK_PORT }} knock -4 ${{ secrets.SSH_SERVER }} ${{ secrets.SSH_KNOCK_PORT }}
@ -932,7 +932,7 @@ jobs:
EOF EOF
- name: Clear Cloudflare cache - name: Clear Cloudflare cache
if: needs.Prepare_Build.outputs.RELEASE == 'true' if: needs.Prepare_Patch.outputs.RELEASE == 'true'
run: | run: |
curl --request POST --url "https://api.cloudflare.com/client/v4/zones/096723464400de10b6eb85028baa8372/purge_cache" \ curl --request POST --url "https://api.cloudflare.com/client/v4/zones/096723464400de10b6eb85028baa8372/purge_cache" \
--header "Authorization: Bearer 9GDQkzU51QXaqzp1qMjyFKpyeJyOdnNoG9GZQaGP" \ --header "Authorization: Bearer 9GDQkzU51QXaqzp1qMjyFKpyeJyOdnNoG9GZQaGP" \
@ -940,15 +940,15 @@ jobs:
--data '{"purge_everything": true}' --data '{"purge_everything": true}'
Update_Release: Update_Release:
needs: [Prepare_Build,Build_RouterOS] needs: [Prepare_Patch,Build_RouterOS]
if: | if: |
needs.Prepare_Build.outputs.SKIP_BUILD == 'false' && needs.Prepare_Patch.outputs.SKIP_BUILD == 'false' &&
needs.Build_RouterOS.result == 'success' && needs.Build_RouterOS.result == 'success' &&
needs.Prepare_Build.outputs.RELEASE == 'true' needs.Prepare_Patch.outputs.RELEASE == 'true'
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
env: env:
CHANNEL: ${{ inputs.channel }} CHANNEL: ${{ inputs.channel }}
VERSION: ${{ needs.Prepare_Build.outputs.VERSION }} VERSION: ${{ needs.Prepare_Patch.outputs.VERSION }}
steps: steps:
- name: Update Release - name: Update Release
run: | run: |