diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 46e3bb7d9..fa465df30 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -17,6 +17,11 @@ on: required: true type: boolean default: false + refLTITag: + description: 'Reference LTI Tag/Branch' + type: string + required: true + default: main workflow_dispatch: inputs: useLocalPlugin: @@ -29,6 +34,11 @@ on: type: string required: true default: main + refLTITag: + description: 'Reference LTI Tag/Branch' + type: string + required: false + default: main push: branches: '**' pull_request: @@ -54,7 +64,8 @@ jobs: env: USE_LOCAL_PLUGIN: ${{ inputs.useLocalPlugin || false }} REF_LSP4IJ: ${{ inputs.refLsp4ij }} - LSP4IJ_BRANCH: ${{ inputs.lsp4ijBranch || 'latest' }} + LSP4IJ_BRANCH: ${{ inputs.lsp4ijBranch || 'default' }} + REF_LTI_TAG: ${{ inputs.refLTITag }} steps: - name: Configure pagefile if: contains(matrix.os, 'windows') @@ -67,6 +78,7 @@ jobs: uses: actions/checkout@v3 with: path: liberty-tools-intellij + ref: ${{ env.REF_LTI_TAG }} - name: 'Install required integration test software' working-directory: ./liberty-tools-intellij run: bash ./src/test/resources/ci/scripts/setup.sh @@ -96,7 +108,7 @@ jobs: if: ${{ runner.os == 'Linux' && !failure() }} uses: actions/upload-artifact@v4.3.4 with: - name: liberty-tools-intellij-LTI-main-LSP4IJ-${{ env.LSP4IJ_BRANCH }} + name: liberty-tools-intellij-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH }} path: | ./**/*liberty-tools-intellij*.zip ./**/libs/*liberty-tools-intellij*.jar diff --git a/.github/workflows/cronJob.yaml b/.github/workflows/cronJob.yaml index 659c8304c..4d78788cc 100644 --- a/.github/workflows/cronJob.yaml +++ b/.github/workflows/cronJob.yaml @@ -94,21 +94,30 @@ jobs: strategy: fail-fast: false matrix: + # Existing LTI release tags and branches can be added to obtain build results.If the tag array is empty, it will default to 'main'. However, if there is at least one tag or branch in the tag array and you need to run on 'main' as well, make sure to add 'main' to the array. + tag: [ 'lsp4ij-market-0.0.2-integration' ] # Can specify tags or branches such as '24.0.6' and 'main' pr_details: ${{ fromJson(needs.fetch_all_pull_request_shas.outputs.pr_details) }} with: useLocalPlugin: true refLsp4ij: ${{ matrix.pr_details.sha }} lsp4ijBranch: PR-${{ matrix.pr_details.number }} - name: Running PR + refLTITag: ${{ matrix.tag }} + name: Run PR # Run the LTI Tests against lsp4ij main branch call-build-workflow-for-lsp4ij-main-branch: uses: ./.github/workflows/build.yaml + strategy: + fail-fast: false + matrix: + # Existing LTI release tags and branches can be added to obtain build results.If the tag array is empty, it will default to 'main'. However, if there is at least one tag or branch in the tag array and you need to run on 'main' as well, make sure to add 'main' to the array. + tag: [ 'lsp4ij-market-0.0.2-integration' ] with: useLocalPlugin: true refLsp4ij: main lsp4ijBranch: main - name: Run LTI tests for Lsp4ij Main branch + refLTITag: ${{ matrix.tag }} + name: Run Lsp4ij Main # Send slack notification for build results call-build-workflow-slack-notification: