Skip to content

Commit

Permalink
ci(submodule): remove config for updating old 2.x repo (#1182)
Browse files Browse the repository at this point in the history
(cherry picked from commit 58c991a)

# Conflicts:
#	.github/workflows/submodule.yaml
  • Loading branch information
andrewazores authored and mergify[bot] committed Dec 13, 2023
1 parent 5bfd530 commit 8f2e721
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/submodule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,21 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
<<<<<<< HEAD
repository: cryostatio/cryostat
token: "${{ secrets.SUBMODULE_TOKEN }}"
ref: "${{ github.ref_name }}"
- name: Check remote submodule branch
run: |
remote_branch="$(git config --get -f .gitmodules submodule.web-client.branch)"
=======
repository: cryostatio/cryostat3
token: "${{ secrets.SUBMODULE_TOKEN }}"
ref: "${{ github.ref_name }}"
- name: Check remote cryostat3 submodule branch
run: |
remote_branch="$(git config --get -f .gitmodules submodule."src/main/webui".branch)"
>>>>>>> 58c991a (ci(submodule): remove config for updating old 2.x repo (#1182))
if [[ "$remote_branch" != "${{ github.ref_name }}" ]]; then
printf "Expected remote branch %s, found branch %s\n" "${{ github.ref_name }}" "$remote_branch" >&2
exit 1
Expand All @@ -43,6 +52,11 @@ jobs:
- name: Commit and push submodule
run: |
git add --all
<<<<<<< HEAD
git_hash="$(git rev-parse --short :web-client)"
git commit -S -m "build(web-client): update submodule to $git_hash" || echo "No changes to commit"
=======
git_hash="$(git rev-parse --short :src/main/webui)"
git commit -S -m "build(webui): update submodule to $git_hash" || echo "No changes to commit"
>>>>>>> 58c991a (ci(submodule): remove config for updating old 2.x repo (#1182))
git push

0 comments on commit 8f2e721

Please sign in to comment.