|
37 | 37 | TAG_GIT_WORKFLOW_RUN_ID: "${{github.event.inputs.tag_git_workflow_run_id}}" |
38 | 38 | EXISTING_GIT_TAG: "${{github.event.inputs.existing_git_tag}}" |
39 | 39 | RELEASE_BRANCH: "${{github.event.inputs.release_branch}}" |
| 40 | + GIT_OR_MINGIT: "Git" |
40 | 41 |
|
41 | 42 | defaults: |
42 | 43 | run: |
@@ -68,11 +69,23 @@ jobs: |
68 | 69 | test -z "$TAG_GIT_WORKFLOW_RUN_ID" || |
69 | 70 | die 'existing_git_tag cannot be used with tag_git_workflow_run_id!' |
70 | 71 |
|
| 72 | + if test mingit = "$ARTIFACTS_TO_BUILD" || test "mingit mingit-busybox" = "$ARTIFACTS_TO_BUILD" |
| 73 | + then |
| 74 | + GIT_OR_MINGIT=MinGit |
| 75 | + echo "GIT_OR_MINGIT=MinGit" >>$GITHUB_ENV |
| 76 | + fi |
| 77 | +
|
71 | 78 | if test -n "$RELEASE_BRANCH" |
72 | 79 | then |
73 | | - RELEASE_BRANCH="${EXISTING_GIT_TAG%%.windows.*}" && |
74 | | - RELEASE_BRANCH=git-"${RELEASE_BRANCH#v}" && |
75 | | - test git- != "$RELEASE_BRANCH" || |
| 80 | + if test MinGit = "$GIT_OR_MINGIT" |
| 81 | + then |
| 82 | + RELEASE_BRANCH=mingit-"$(expr "$EXISTING_GIT_TAG" : 'v\?\([0-9]\+\.[0-9]\+\)\.\{0,1\}[0-9]*\(\.windows\.[0-9]*\)\?$')".x-releases && |
| 83 | + test mingit-.x-releases != "$RELEASE_BRANCH" |
| 84 | + else |
| 85 | + RELEASE_BRANCH="${EXISTING_GIT_TAG%%.windows.*}" && |
| 86 | + RELEASE_BRANCH=git-"${RELEASE_BRANCH#v}" && |
| 87 | + test git- != "$RELEASE_BRANCH" |
| 88 | + fi || |
76 | 89 | die "Could not determine release branch from '$EXISTING_GIT_TAG'" |
77 | 90 | echo "RELEASE_BRANCH=$RELEASE_BRANCH" >>$GITHUB_ENV |
78 | 91 | fi |
@@ -134,8 +147,8 @@ jobs: |
134 | 147 | repo: ${{ env.REPO }} |
135 | 148 | rev: ${{ env.GIT_REV }} |
136 | 149 | check-run-name: "git-artifacts-${{ env.ARCHITECTURE }}" |
137 | | - title: "Build Git ${{ env.GIT_VERSION }} artifacts" |
138 | | - summary: "Build Git ${{ env.GIT_VERSION }} artifacts from commit ${{ env.GIT_REV }}${{ env.TAG_GIT_WORKFLOW_RUN_ID && format(' (tag-git run #{0})', env.TAG_GIT_WORKFLOW_RUN_ID) || '' }}" |
| 150 | + title: "Build ${{ env.GIT_OR_MINGIT }} ${{ env.GIT_VERSION }} artifacts" |
| 151 | + summary: "Build ${{ env.GIT_OR_MINGIT }} ${{ env.GIT_VERSION }} artifacts from commit ${{ env.GIT_REV }}${{ env.TAG_GIT_WORKFLOW_RUN_ID && format(' (tag-git run #{0})', env.TAG_GIT_WORKFLOW_RUN_ID) || '' }}" |
139 | 152 | text: "For details, see [this run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id}})." |
140 | 153 | details-url: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id}}" |
141 | 154 | - name: Re-publish bundle-artifacts so the next job can easily use it |
|
0 commit comments