diff --git a/.github/workflows/k2p.yml b/.github/workflows/k2p.yml index 110c26e..c81a71e 100644 --- a/.github/workflows/k2p.yml +++ b/.github/workflows/k2p.yml @@ -188,12 +188,12 @@ jobs: echo "FIRMWARE=$PWD" >> $GITHUB_ENV echo "status=success" >> ${GITHUB_OUTPUT} - - name: Upload firmware directory - uses: actions/upload-artifact@main - if: steps.organize.outputs.status == 'success' && !cancelled() - with: - name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} - path: ${{ env.FIRMWARE }} + # - name: Upload firmware directory + # uses: actions/upload-artifact@main + # if: steps.organize.outputs.status == 'success' && !cancelled() + # with: + # name: OpenWrt_firmware${{ env.DEVICE_NAME }}${{ env.FILE_DATE }} + # path: ${{ env.FIRMWARE }} - name: Upload firmware to cowtransfer id: cowtransfer @@ -213,27 +213,37 @@ jobs: echo "::warning file=wetransfer.com::$(cat wetransfer.log | grep https)" echo "url=$(cat wetransfer.log | grep https | cut -f3 -d" ")" >> ${GITHUB_OUTPUT} - - name: Generate release tag - id: tag - if: env.UPLOAD_RELEASE == 'true' && !cancelled() - run: | - echo "release_tag=$(date +"%Y.%m.%d-%H%M")" >> ${GITHUB_OUTPUT} - touch release.txt - [ $UPLOAD_COWTRANSFER = true ] && echo "πŸ”— [Cowtransfer](${{ steps.cowtransfer.outputs.url }})" >> release.txt - [ $UPLOAD_WETRANSFER = true ] && echo "πŸ”— [WeTransfer](${{ steps.wetransfer.outputs.url }})" >> release.txt - echo "status=success" >> ${GITHUB_OUTPUT} + # - name: Generate release tag + # id: tag + # if: env.UPLOAD_RELEASE == 'true' && !cancelled() + # run: | + # echo "release_tag=$(date +"%Y.%m.%d-%H%M")" >> ${GITHUB_OUTPUT} + # touch release.txt + # [ $UPLOAD_COWTRANSFER = true ] && echo "πŸ”— [Cowtransfer](${{ steps.cowtransfer.outputs.url }})" >> release.txt + # [ $UPLOAD_WETRANSFER = true ] && echo "πŸ”— [WeTransfer](${{ steps.wetransfer.outputs.url }})" >> release.txt + # echo "status=success" >> ${GITHUB_OUTPUT} - name: Upload firmware to release - uses: softprops/action-gh-release@v1 - if: steps.tag.outputs.status == 'success' && !cancelled() + uses: ncipollo/release-action@v1.13.0 + # uses: softprops/action-gh-release@v1 + # if: steps.tag.outputs.status == 'success' && !cancelled() env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: name: ${{ env.FILE_DATE }} for ${{ env.OPENWRT_TAG }} ${{ env.EMOJI }} - tag_name: ${{ env.OPENWRT_TAG }} + tag: ${{ env.OPENWRT_TAG }} # tag_name: ${{ steps.tag.outputs.release_tag }} - body_path: release.txt - files: ${{ env.FIRMWARE }}/* + # body_path: release.txt + # files: ${{ env.FIRMWARE }}/* + allowUpdates: true + body: | + This is OpenWrt firmware for k2p + ### πŸ“’ Firmware information + - ⚽ 固仢源码: ${{ env.REPO_URL }} + - πŸ’ ζΊη εˆ†ζ”―: ${{ env.REPO_BRANCH }} + - 🌐 Default IP: 192.168.2.1 + - πŸ”‘ Default username: root + - πŸ”‘ Default password: password - name: Delete workflow runs uses: Mattraks/delete-workflow-runs@v2.0.4