Skip to content

Commit dda0fce

Browse files
authored
Merge pull request #12227 from IQSS/extra_workflows
extra workflows, a remake
2 parents cb48a82 + ccd056c commit dda0fce

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

.github/workflows/deploy_to_internal.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
inputs:
66
buildlabel:
7-
description: 'Custom label that will appear after the version number (the equivalent of the old "build number" entry).'
7+
description: 'Custom label that will appear after the version number (the equivalent of the old "build number" entry). Leaving it empty will default to the legacy behavior, i.e. " build <branch>-<checksum>".'
88
type: string
99
required: false
1010

@@ -28,7 +28,7 @@ jobs:
2828
java-version: '21'
2929

3030
- name: Set build number
31-
run: scripts/installer/custom-build-number ${{ github.event.inputs.buildlabel }}
31+
run: scripts/installer/custom-build-number "${{ github.event.inputs.buildlabel }}"
3232

3333
- name: Build application war
3434
run: mvn package

.github/workflows/generate_war_file.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
inputs:
66
buildlabel:
7-
description: 'Custom label that will appear after the version number (the equivalent of the old "build number" entry).'
7+
description: 'Custom label that will appear after the version number (the equivalent of the old "build number" entry). Leaving it empty will default to the legacy behavior, i.e. " build <branch>-<checksum>".'
88
type: string
99
required: false
1010

@@ -21,11 +21,7 @@ jobs:
2121
java-version: '21'
2222

2323
- name: Set build number
24-
run: scripts/installer/custom-build-number ${{ github.event.inputs.buildlabel }}
25-
26-
- name: Get branch name
27-
id: branch-name
28-
uses: tj-actions/branch-names@v7.07
24+
run: scripts/installer/custom-build-number "${{ github.event.inputs.buildlabel }}"
2925

3026
- name: Build application war
3127
run: mvn package

0 commit comments

Comments
 (0)