From 61b0130361d131dedfac35047af2d841d7e171d6 Mon Sep 17 00:00:00 2001 From: Roman Dmitrienko Date: Mon, 3 Jun 2024 20:50:56 +0200 Subject: [PATCH] Do not check out non-existent branches. --- .../workflows/build-and-publish-bindings.yml | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-publish-bindings.yml b/.github/workflows/build-and-publish-bindings.yml index ec4d5ee1c..003aea69a 100644 --- a/.github/workflows/build-and-publish-bindings.yml +++ b/.github/workflows/build-and-publish-bindings.yml @@ -7,7 +7,7 @@ on: env: RUST_VERSION: 1.78 - BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + LDK_BRANCH_NAME: ${{ github.head_ref || github.ref_name }} TARGET_BRANCH_PREFIX: "publish-" jobs: @@ -116,21 +116,12 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Checkout ldk-node-go master + - name: Checkout ldk-node-go uses: actions/checkout@v4 - if: ${{ env.BRANCH_NAME == 'main' }} with: repository: getAlby/ldk-node-go ssh-key: ${{ secrets.LDK_NODE_GO_DEPLOY_KEY }} - - name: Checkout ldk-node-go branch - uses: actions/checkout@v4 - if: ${{ env.BRANCH_NAME != 'main' }} - with: - repository: getAlby/ldk-node-go - ssh-key: ${{ secrets.LDK_NODE_GO_DEPLOY_KEY }} - ref: '${{ env.TARGET_BRANCH_PREFIX }}${{ env.BRANCH_NAME }}' - - name: Download bindings uses: actions/download-artifact@v4 with: @@ -166,10 +157,18 @@ jobs: git config --global user.email "github-actions@github.com" git config --global user.name "github-actions" git config --global push.autoSetupRemote true + if [ "${{ env.LDK_BRANCH_NAME }}" != "main" ]; then + git checkout -b ${{ env.TARGET_BRANCH_PREFIX }}${{ env.LDK_BRANCH_NAME }} + fi git add ldk_node/ldk_node.go ldk_node/ldk_node.h ldk_node/ldk_node.c git add ldk_node/x86_64-unknown-linux-gnu/libldk_node.so git add ldk_node/arm-unknown-linux-gnueabihf/libldk_node.so git add ldk_node/x86_64-pc-windows-gnu/ldk_node.dll git add ldk_node/universal-macos/libldk_node.dylib git commit -m "Update bindings." - git push + + if [ "${{ env.LDK_BRANCH_NAME }}" != "main" ]; then + git push origin ${{ env.TARGET_BRANCH_PREFIX }}${{ env.LDK_BRANCH_NAME }} + else + git push origin master + fi