Skip to content

Commit

Permalink
ci: fix test-sdk job in submodule_update.yml
Browse files Browse the repository at this point in the history
Fix the `test-sdk` job in the `submodule_update.yml` workflow according
to the new name policy for supported branches (2.10 -> release/2.10,
2.11 -> release/2.11).

NO_DOC=ci
NO_TEST=ci
NO_CHANGELOG=ci
  • Loading branch information
ylobankov committed Jun 8, 2023
1 parent 8ceef02 commit 8315869
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/submodule_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ jobs:
EE_SHA: ${{ needs.update-ee.outputs.commit-sha }}

steps:
- name: Update submodule tarantool-${{ github.ref_name }} in tarantool/sdk@${{ env.SDK_FEATURE_BRANCH }}
- name: Set sdk submodule name
run: echo "SDK_SUBMODULE=tarantool-$(basename ${{ github.ref_name }})" >> $GITHUB_ENV

- name: Update submodule ${{ env.SDK_SUBMODULE }} in tarantool/sdk@${{ env.SDK_FEATURE_BRANCH }}
uses: tarantool/actions/update-submodule@master
id: test-sdk
with:
Expand All @@ -78,18 +81,18 @@ jobs:
checkout_branch: 'master'
# Same branch name pattern as used in sdk_test workflow
feature_branch: ${{ env.SDK_FEATURE_BRANCH }}
submodule: 'tarantool-${{ github.ref_name }}'
submodule: ${{ env.SDK_SUBMODULE }}
update_to: ${{ env.EE_SHA }}
create_pr: 'false'
commit_message: |
integration-test: tarantool-${{ github.ref_name }}@${{ github.ref_name }}
test: ee@${{ github.ref_name }} -> sdk:${{ env.SDK_SUBMODULE }}
bump submodule tarantool-${{ github.ref_name }} to commit
bump submodule ${{ env.SDK_SUBMODULE }} to commit
tarantool/tarantool-ee@${{ env.EE_SHA }},
which is the HEAD of branch
tarantool/tarantool-ee@${{ env.EE_FEATURE_BRANCH }},
just updated with commit
tarantool/tarantool@${{ github.sha }}
tarantool/tarantool@${{ github.sha }},
which is the HEAD of branch
tarantool/tarantool@${{ github.ref_name }}.
Expand Down

0 comments on commit 8315869

Please sign in to comment.