Skip to content

[3.4] Add explicit task dependency between build*Tar and build in distribution/archives/build.gradle #20281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cwperks merged 4 commits into from
Dec 19, 2025
Merged

[3.4] Add explicit task dependency between build*Tar and build in distribution/archives/build.gradle #20281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8d03fc
Add explicit task dependency between assemble and installDist in dist…
cwperks Dec 17, 2025
951fb7a
Wire up buildLinuxTar -> buildLinux dependency
cwperks Dec 17, 2025
1fb7fb9
Free up space on the runner
cwperks Dec 18, 2025
72d8d4f
reorder
cwperks Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/assemble.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-15, ubuntu-24.04-arm]
steps:
- uses: actions/checkout@v5
# https://github.com/actions/runner-images/issues/2840#issuecomment-790492173
- name: Remove unnecessary files Linux
if: ${{ runner.os == 'Linux' }}
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v5
with:
Expand Down
14 changes: 12 additions & 2 deletions distribution/archives/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* under the License.
*/

import org.opensearch.gradle.JavaPackageType
import org.opensearch.gradle.JavaPackageType

apply plugin: 'opensearch.internal-distribution-archive-setup'

Expand Down Expand Up @@ -193,7 +193,7 @@ distribution_archives {
}
}


linuxPpc64leTar {
archiveClassifier = 'linux-ppc64le'
content {
Expand Down Expand Up @@ -244,6 +244,16 @@ subprojects {
group = "org.opensearch.distribution"
}

tasks.configureEach { t ->
if (t.name ==~ /^build.+Tar$/) {
def base = t.name - 'Tar' // buildLinuxTar -> buildLinux
def stage = tasks.findByName(base)
if (stage != null) {
t.dependsOn(stage)
}
}
}

tasks.each {
if (it.name.startsWith("build")) {
it.dependsOn project(':libs:agent-sm:agent').assemble
Expand Down
Loading