Skip to content

Commit 6d9b2a9

Browse files
committed
Avoided if condition check and added exclude
1 parent b16c0cb commit 6d9b2a9

File tree

1 file changed

+16
-26
lines changed

1 file changed

+16
-26
lines changed

.github/workflows/build.yaml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -50,69 +50,60 @@ jobs:
5050
strategy:
5151
fail-fast: false
5252
matrix:
53-
runtime: [ linux, mac, windows ]
54-
include:
55-
- runtime: linux
56-
os: ubuntu-latest
57-
reportName: linux-test-report
58-
# Adding a check on macOS and Windows to verify if 'refLTITag' is equal to '24.0.9'. The value of 'excludeFromBuild' is used to determine whether the steps below need to be executed.
59-
# This 'excludeFromBuild' variable can be removed once the '24.0.9' version is removed from the 'tag' array of the cron job build.
60-
- runtime: mac
61-
os: macOS-latest
62-
reportName: mac-test-report
63-
excludeFromBuild: ${{ inputs.refLTITag == '24.0.9' }}
64-
- runtime: windows
53+
os: [ ubuntu-latest, macOS-latest, windows-latest ]
54+
is24.0.9:
55+
- ${{ inputs.refLTITag == '24.0.9' }}
56+
exclude:
57+
- is24.0.9: true
6558
os: windows-latest
66-
reportName: windows-test-report
67-
excludeFromBuild: ${{ inputs.refLTITag == '24.0.9' }}
59+
- is24.0.9: true
60+
os: macOS-latest
61+
6862
env:
6963
USE_LOCAL_PLUGIN: ${{ inputs.useLocalPlugin || false }}
7064
REF_LSP4IJ: ${{ inputs.refLsp4ij }}
7165
LSP4IJ_BRANCH: ${{ inputs.lsp4ijBranch || 'default' }}
7266
REF_LTI_TAG: ${{ inputs.refLTITag }}
7367
steps:
7468
- name: Configure pagefile
75-
if: ${{ contains(matrix.os, 'windows') && !matrix.excludeFromBuild }}
69+
if: contains(matrix.os, 'windows')
7670
uses: al-cheb/[email protected]
7771
with:
7872
minimum-size: 8GB
7973
maximum-size: 10GB
8074
disk-root: "C:"
8175
- name: 'Checkout liberty-tools-intellij'
82-
if: ${{ !matrix.excludeFromBuild }}
8376
uses: actions/checkout@v4
8477
with:
8578
path: liberty-tools-intellij
8679
ref: ${{ env.REF_LTI_TAG }}
8780
- name: 'Install required integration test software'
88-
if: ${{ !matrix.excludeFromBuild }}
8981
working-directory: ./liberty-tools-intellij
9082
run: bash ./src/test/resources/ci/scripts/setup.sh
9183

9284
# Checkout and build lsp4ij only if USE_LOCAL_PLUGIN is true
9385
- name: 'Checkout lsp4ij'
94-
if: ${{ inputs.useLocalPlugin == true && !matrix.excludeFromBuild }}
86+
if: ${{ inputs.useLocalPlugin == true }}
9587
uses: actions/checkout@v4
9688
with:
9789
repository: redhat-developer/lsp4ij
9890
path: lsp4ij
9991
ref: ${{ env.REF_LSP4IJ }}
10092
- name: 'Build Lsp4ij'
101-
if: ${{ inputs.useLocalPlugin == true && !matrix.excludeFromBuild }}
93+
if: ${{ inputs.useLocalPlugin == true }}
10294
working-directory: ./lsp4ij
10395
run: bash ./gradlew buildPlugin
10496
- name: 'Unzip lsp4ij file'
105-
if: ${{ inputs.useLocalPlugin == true && !matrix.excludeFromBuild }}
97+
if: ${{ inputs.useLocalPlugin == true }}
10698
working-directory: ./lsp4ij/build/distributions
10799
run: |
108100
unzip -o '*.zip' -d .
109101
110102
- name: 'Build Liberty-Tools-Intellij'
111-
if: ${{ !matrix.excludeFromBuild }}
112103
working-directory: ./liberty-tools-intellij
113104
run: bash ./gradlew buildPlugin -PuseLocal=${{ env.USE_LOCAL_PLUGIN }}
114105
- name: 'Archive artifacts'
115-
if: ${{ (runner.os == 'Linux' && !failure()) && !matrix.excludeFromBuild }}
106+
if: ${{ runner.os == 'Linux' && !failure() }}
116107
uses: actions/[email protected]
117108
with:
118109
name: liberty-tools-intellij-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH }}
@@ -122,14 +113,13 @@ jobs:
122113
if-no-files-found: warn
123114
retention-days: 7
124115
- name: 'Run UI integration tests'
125-
if: ${{ !matrix.excludeFromBuild }}
126116
id: run_tests
127117
working-directory: ./liberty-tools-intellij
128118
run: bash ./src/test/resources/ci/scripts/run.sh
129119
- name: 'Archive Test logs and reports'
130-
if: ${{ (failure() && steps.run_tests.conclusion == 'failure') && !matrix.excludeFromBuild }}
120+
if: ${{ failure() && steps.run_tests.conclusion == 'failure' }}
131121
uses: actions/[email protected]
132122
with:
133-
name: ${{ matrix.reportName }}-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH }}
123+
name: ${{ matrix.os }}-test-report-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH }}
134124
path: |
135-
liberty-tools-intellij/build/reports/
125+
liberty-tools-intellij/build/reports/

0 commit comments

Comments
 (0)