Skip to content

Commit 286717b

Browse files
committed
remove branch-specific LibAPR checkout
It tends to mess up the versioning and thus the deployment workflow.
1 parent 68441d9 commit 286717b

File tree

1 file changed

+0
-27
lines changed

1 file changed

+0
-27
lines changed

.github/workflows/build-deploy.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,33 +67,6 @@ jobs:
6767
- name: Submodule recursive
6868
run: git submodule update --init --recursive
6969

70-
# PR/push to develop should use the develop branch of LibAPR
71-
# for pull requests, we set the LibAPR branch based on the target (base) branch
72-
- name: Get branch name (pull request)
73-
if: ${{ github.event_name == 'pull_request' }}
74-
shell: bash
75-
run: echo "BRANCH_NAME=$(echo ${GITHUB_BASE_REF} | tr / -)" >> $GITHUB_ENV
76-
77-
- name: Get branch name (push)
78-
if: ${{ (github.event_name == 'push') && !contains(github.ref, 'tags') }}
79-
shell: bash
80-
run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
81-
82-
- name: Get branch name (tag push)
83-
if: ${{ (github.event_name == 'push') && contains(github.ref, 'tags') }}
84-
shell: bash
85-
run: |
86-
raw=$(git branch -r --contains ${{ github.ref }})
87-
branch=${raw/origin\/}
88-
echo "BRANCH_NAME=$(echo $branch)" >> $GITHUB_ENV
89-
90-
- name: Checkout LibAPR develop/master branch
91-
shell: bash
92-
run: |
93-
echo "checking out branch ${{ env.BRANCH_NAME }} of submodule external/LibAPR"
94-
cd external/LibAPR
95-
git checkout ${{ env.BRANCH_NAME }}
96-
9770
# Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.
9871
- uses: lukka/get-cmake@latest
9972
# Restore both vcpkg and its artifacts from the GitHub cache service.

0 commit comments

Comments
 (0)