From f9a895fcb9596175779254037634690de4182240 Mon Sep 17 00:00:00 2001 From: kifir Date: Mon, 1 Jul 2024 20:32:43 +0300 Subject: [PATCH 1/3] only: light optimization --- .github/workflows/custom-board-build/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/custom-board-build/action.yaml b/.github/workflows/custom-board-build/action.yaml index f4dbc2e912..0a795ffa52 100644 --- a/.github/workflows/custom-board-build/action.yaml +++ b/.github/workflows/custom-board-build/action.yaml @@ -497,6 +497,7 @@ runs: path: ${{inputs.rusefi_dir}}/artifacts/rusefi_bundle_${{env.SHORT_BOARD_NAME}}_obfuscated_public_autoupdate.zip - uses: mukunku/tag-exists-action@v1.6.0 + if: ${{ inputs.release_date != '' }} id: checkTag with: tag: ${{ inputs.release_date }} From 01befca32fb4927648820e9434c0237ea6a2e051 Mon Sep 17 00:00:00 2001 From: kifir Date: Mon, 1 Jul 2024 20:39:50 +0300 Subject: [PATCH 2/3] only: rename `release_date` input parameter into `new_tag` --- .../workflows/custom-board-build/action.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/custom-board-build/action.yaml b/.github/workflows/custom-board-build/action.yaml index 0a795ffa52..0290afd99e 100644 --- a/.github/workflows/custom-board-build/action.yaml +++ b/.github/workflows/custom-board-build/action.yaml @@ -24,8 +24,8 @@ inputs: description: 'LTS Build' required: false default: 'false' - release_date: - description: 'Date for nightly releases' + new_tag: + description: 'Tag to create in the repo for this build' required: false bundle_simulator: description: 'Include Simulator in Bundle' @@ -497,10 +497,10 @@ runs: path: ${{inputs.rusefi_dir}}/artifacts/rusefi_bundle_${{env.SHORT_BOARD_NAME}}_obfuscated_public_autoupdate.zip - uses: mukunku/tag-exists-action@v1.6.0 - if: ${{ inputs.release_date != '' }} + if: ${{ inputs.new_tag != '' }} id: checkTag with: - tag: ${{ inputs.release_date }} + tag: ${{ inputs.new_tag }} - name: Output Tag Debugging Information shell: bash @@ -508,16 +508,16 @@ runs: : Output Tag Debugging Information : # TODO: remove this step after unexpected tags disappear echo 'steps.checkTag.outputs.exists: "${{ steps.checkTag.outputs.exists }}"' - echo 'inputs.release_date: "${{ inputs.release_date }}"' + echo 'inputs.new_tag: "${{ inputs.new_tag }}"' echo 'github.ref_name: "${{ github.ref_name }}"' - name: Create Release Tag - if: ${{ inputs.release_date != '' && steps.checkTag.outputs.exists == 'false' }} + if: ${{ inputs.new_tag != '' && steps.checkTag.outputs.exists == 'false' }} id: tag uses: mathieudutour/github-tag-action@v6.2 with: github_token: ${{env.TOKEN}} - custom_tag: ${{ inputs.release_date }} + custom_tag: ${{ inputs.new_tag }} tag_prefix: '' - name: Upload Tagged Daily Release Bundle @@ -526,7 +526,7 @@ runs: shell: bash run: | : Upload Tagged Daily Release Bundle - bash ../firmware/bin/upload_bundle.sh ${{ env.RUSEFI_SSH_USER }} ${{ env.RUSEFI_SSH_PASS }} ${{ env.RUSEFI_SSH_SERVER }} ${{ env.BUNDLE_NAME }} ${{ inputs.release_date }} + bash ../firmware/bin/upload_bundle.sh ${{ env.RUSEFI_SSH_USER }} ${{ env.RUSEFI_SSH_PASS }} ${{ env.RUSEFI_SSH_SERVER }} ${{ env.BUNDLE_NAME }} ${{ inputs.new_tag }} - name: Upload Obfuscated Tagged Daily Release Bundle if: ${{ contains(inputs.artifacts, 'obfuscated') && steps.checkTag.outputs.exists == 'false'}} @@ -534,4 +534,4 @@ runs: shell: bash run: | : Upload Obfuscated Tagged Daily Release Bundle - bash ../firmware/bin/upload_bundle.sh ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_USER }} "${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_PASS }}" ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_SERVER }} "${{env.SHORT_BOARD_NAME}}_obfuscated_public" ${{ inputs.release_date }} + bash ../firmware/bin/upload_bundle.sh ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_USER }} "${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_PASS }}" ${{ inputs.RUSEFI_OBFUSCATED_PUBLIC_SSH_SERVER }} "${{env.SHORT_BOARD_NAME}}_obfuscated_public" ${{ inputs.new_tag }} From 2e903796513edf39629edfb6495bb2b634a9deb7 Mon Sep 17 00:00:00 2001 From: kifir Date: Mon, 1 Jul 2024 20:43:41 +0300 Subject: [PATCH 3/3] only: get rid of debugging logging --- .github/workflows/custom-board-build/action.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/custom-board-build/action.yaml b/.github/workflows/custom-board-build/action.yaml index 0290afd99e..54beefd98b 100644 --- a/.github/workflows/custom-board-build/action.yaml +++ b/.github/workflows/custom-board-build/action.yaml @@ -502,15 +502,6 @@ runs: with: tag: ${{ inputs.new_tag }} - - name: Output Tag Debugging Information - shell: bash - run: | - : Output Tag Debugging Information - : # TODO: remove this step after unexpected tags disappear - echo 'steps.checkTag.outputs.exists: "${{ steps.checkTag.outputs.exists }}"' - echo 'inputs.new_tag: "${{ inputs.new_tag }}"' - echo 'github.ref_name: "${{ github.ref_name }}"' - - name: Create Release Tag if: ${{ inputs.new_tag != '' && steps.checkTag.outputs.exists == 'false' }} id: tag