From f9d3ba1bc12e7a3783f4f6f9db796f019715aafb Mon Sep 17 00:00:00 2001 From: ophub Date: Sat, 2 Oct 2021 16:51:13 +0800 Subject: [PATCH] Delete SSH connection to Actions --- .github/workflows/build-armbian.yml | 14 +------------- .github/workflows/use-releases-file-to-build.yml | 14 +------------- README.cn.md | 2 +- README.md | 2 +- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml index 6470e7838f..3ddfc0aa39 100644 --- a/.github/workflows/build-armbian.yml +++ b/.github/workflows/build-armbian.yml @@ -8,11 +8,6 @@ name: Build Armbian For Amlogic on: repository_dispatch: workflow_dispatch: - inputs: - ssh: - description: 'SSH connection to Actions' - required: false - default: 'false' schedule: - cron: '0 17 * * 0' @@ -54,13 +49,6 @@ jobs: id: down run: | git clone --depth 1 https://github.com/armbian/build.git - - - name: SSH connection to Actions @ Ctrl+C to enter, Ctrl+D to exit - uses: P3TERX/ssh2actions@main - if: (github.event.inputs.ssh == 'true' && github.event.inputs.ssh != 'false') || contains(github.event.action, 'ssh') - env: - TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }} - TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }} - name: Build Armbian id: build @@ -76,7 +64,7 @@ jobs: if: steps.build.outputs.status == 'success' run: | sudo chmod +x make - sudo ./make s922x_s905x3_s905d + sudo ./make s922x_s905x3_s905x2_s912_s905d sudo ./make s905x_s905w 5.4.149 cd ./build/output/images && sudo gzip *.img && sync echo "FILEPATH=$PWD" >> $GITHUB_ENV diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml index 5699da09af..ad725b6c06 100644 --- a/.github/workflows/use-releases-file-to-build.yml +++ b/.github/workflows/use-releases-file-to-build.yml @@ -9,11 +9,6 @@ name: Use Releases file to build on: repository_dispatch: workflow_dispatch: - inputs: - ssh: - description: 'SSH connection to Actions' - required: false - default: 'false' #schedule: #- cron: '0 17 * * 0' @@ -52,19 +47,12 @@ jobs: [ -s DOWNLOAD_ARMBIAN ] && wget -q -P build/output/images https://github.com/${GITHUB_REPOSITORY}/releases/download/$(cat DOWNLOAD_ARMBIAN) cd ./build/output/images && gzip -df *.img.gz && sync && cd ../../../ sudo chmod +x make - sudo ./make s922x_s905x3_s905d + sudo ./make s922x_s905x3_s905x2_s912_s905d sudo ./make s905x_s905w 5.4.149 cd ./build/output/images && sudo gzip *.img && sync echo "FILEPATH=$PWD" >> $GITHUB_ENV echo "FILE_DATE=$(date +"%Y.%m.%d.%H%M")" >> $GITHUB_ENV echo "::set-output name=status::success" - - - name: SSH connection to Actions @ Ctrl+C to enter, Ctrl+D to exit - uses: P3TERX/ssh2actions@main - if: (github.event.inputs.ssh == 'true' && github.event.inputs.ssh != 'false') || contains(github.event.action, 'ssh') - env: - TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }} - TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }} - name: Upload artifact to Actions uses: kittaakos/upload-artifact-as-is@master diff --git a/README.cn.md b/README.cn.md index 1f54dde445..cc5e3c69fd 100644 --- a/README.cn.md +++ b/README.cn.md @@ -45,7 +45,7 @@ armbian-update 5.10.66 - 编译单个盒子的 Armbian 时，输入对应的 soc 型号，如 `sudo ./make s905x3`。 如果同时编译多个不同盒子时，将对应的 soc 型号使用 `_` 连接, 如 `sudo ./make s922x_s905x3` -- 可选项: 替换内核。如 `sudo ./make s905x 5.4.149`。当一次编译多个内核版本时，内核版本号使用 `_` 连接。如 `sudo ./make s922x_s905x3 5.4.149_5.14.6`。编译程序会自动到 [内核库](https://github.com/ophub/flippy-kernel/tree/main/library) 中查找你指定的内核系列是否有更新的版本，如果有则直接使用最新版。如果你想使用指定的固定版本，可以在版本号后使用 false 参数固定版本，如 `sudo ./make s905x 5.4.149 false` +- 可选项: 替换内核。如 `sudo ./make s905x 5.4.150`。当一次编译多个内核版本时，内核版本号使用 `_` 连接。如 `sudo ./make s922x_s905x3 5.4.150_5.14.9`。编译程序会自动到 [内核库](https://github.com/ophub/flippy-kernel/tree/main/library) 中查找你指定的内核系列是否有更新的版本，如果有则直接使用最新版。如果你想使用指定的固定版本，可以在版本号后使用 false 参数固定版本，如 `sudo ./make s905x 5.4.150 false` 💡提示：当前 ***`s905x`*** 和 ***`s905w`*** 系列的盒子只支持使用 `5.4.*` 内核，不能使用 5.10.* 或更高版本，请在编译时指定替换内核。其他型号的盒子可任选内核版本使用。 diff --git a/README.md b/README.md index d8e0de041e..e58008a2d1 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ armbian-update 5.10.66 - compile `a single soc` can be directly input `sudo ./make s905x3`. When `multiple soc` is compiled at the same time, please use `_` to connect multiple soc, such as `sudo ./make s922x_s905x3` -- Optionality: Replace the kernel. Run Eg: `sudo ./make s905x 5.4.149`. When multiple kernel versions are generated at one time, the kernel version number is connected with `_` . Run Eg: `sudo ./make s922x_s905x3 5.4.149_5.14.6`. When there is an latest version of the same series of the specified kernel version, the `latest version` will be download from [kernel library](https://github.com/ophub/flippy-kernel/tree/main/library) and used automatically. When you want to compile a `fixed kernel`, Run `sudo ./make s905x 5.4.149 false`. +- Optionality: Replace the kernel. Run Eg: `sudo ./make s905x 5.4.150`. When multiple kernel versions are generated at one time, the kernel version number is connected with `_` . Run Eg: `sudo ./make s922x_s905x3 5.4.150_5.14.9`. When there is an latest version of the same series of the specified kernel version, the `latest version` will be download from [kernel library](https://github.com/ophub/flippy-kernel/tree/main/library) and used automatically. When you want to compile a `fixed kernel`, Run `sudo ./make s905x 5.4.150 false`. 💡Tips: The ***`s905x`*** and ***`s905w`*** boxs currently only support `5.4.*` kernels, Cannot use kernel version 5.10 and above. Please add kernel substitution variables when compiling these two models of devices. Other devices can be freely selected.