retry logic for commit

ssalonen · Dec 14, 2024 · 8972129 · 8972129
1 parent 5923544
commit 8972129
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/.github/actions/bindgen-unix/action.yml b/.github/actions/bindgen-unix/action.yml
@@ -57,11 +57,34 @@ runs:
         SRC_PATH: .
 
     - name: Commit bindings
+      id: commitStep1
       if: ${{ steps.check_bindings_exist.outputs.bindings_exist }}
+      continue-on-error: true
       uses: EndBug/add-and-commit@v9
       with:
         add: src/lib_abi${{ inputs.libcec_major_version }}_${{ inputs.target }}.rs
         message: Update ${{ inputs.target }} libcec${{ inputs.libcec_major_version }} bindings
         pathspec_error_handling: exitImmediately
         pull: --rebase --autostash
 
+    # Retry logic for committing bindings due to race conditions when commit
+    # happens after rebase/pull but before push
+    - name: Commit bindings (retry 1)
+      id: commitStep2
+      if: ${{ steps.commitStep1.outcome == 'failure' && steps.check_bindings_exist.outputs.bindings_exist }}        
+      continue-on-error: true
+      uses: EndBug/add-and-commit@v9
+      with:
+        add: src/lib_abi${{ inputs.libcec_major_version }}_${{ inputs.target }}.rs
+        message: Update ${{ inputs.target }} libcec${{ inputs.libcec_major_version }} bindings
+        pathspec_error_handling: exitImmediately
+        pull: --rebase --autostash
+
+      - name: Commit bindings (retry 2)
+        if: ${{ steps.commitStep2.outcome == 'failure' && steps.check_bindings_exist.outputs.bindings_exist }}
+        uses: EndBug/add-and-commit@v9
+        with:
+          add: src/lib_abi${{ inputs.libcec_major_version }}_${{ inputs.target }}.rs
+          message: Update ${{ inputs.target }} libcec${{ inputs.libcec_major_version }} bindings
+          pathspec_error_handling: exitImmediately
+          pull: --rebase --autostash