Skip to content

Conversation

@adamfarley
Copy link
Contributor

@adamfarley adamfarley commented Sep 12, 2025

Also includes a change to the PR build pipeline workflow to exempt the solaris files as we don't test solaris in those builds.

Status

Linter check - passed.

Test run: Looks like this branch needs to be hard-coded in the job. Created a copy of the job and giving it a shot:

https://ci.adoptium.net/job/adam_farley_solaris_test_job_copy/

@adamfarley adamfarley self-assigned this Sep 12, 2025
@github-actions github-actions bot added the testing Issues that enhance or fix our test suites label Sep 12, 2025
@adamfarley adamfarley moved this to In Progress in 2025 Adoptium Plan Sep 12, 2025
...because we don't run builds on solaris as part of said checks,
so it's a waste of time.

Signed-off-by: Adam Farley <[email protected]>
Signed-off-by: Adam Farley <[email protected]>
Signed-off-by: Adam Farley <[email protected]>
Signed-off-by: Adam Farley <[email protected]>
@adamfarley adamfarley changed the title WIP: Correcting and/or exempting linter shellcheck code warnings Correcting and/or exempting linter shellcheck code warnings Sep 12, 2025
Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably ok but will need testing so I'm not going to approve this yet.

Although I will say that this looks overly complex IMHO:

   XVFB5=`ps -fu vagrant | grep 'Xvfb :5' | grep -v grep | wc -l`
   XVFB5=`ps -fu vagrant | awk '/Xvfb :5/ && !/awk/ {c=c+1} END {print c+0}'`

@karianna
Copy link
Contributor

Probably throwing in a comment explaining some of the more complex shell scripting will help. Copilot is your friend for this :-)

@github-actions github-actions bot added the solaris Issues that affect or relate to the SOLARIS OS label Sep 13, 2025
@adamfarley
Copy link
Contributor Author

Changes blocked. May be related to the webhook failures today. This task is paused until that is resolved and the checks can rerun on the latest commit.

@karianna
Copy link
Contributor

Changes blocked. May be related to the webhook failures today. This task is paused until that is resolved and the checks can rerun on the latest commit.

Merge conflict...

@adamfarley
Copy link
Contributor Author

Merge conflict...

Resolved. Good spot. :)

Will monitor the linter run now. We should be good to merge if that passes.

@adamfarley
Copy link
Contributor Author

Will monitor the linter run now. We should be good to merge if that passes.

It did pass. Requesting reviews please - @karianna @sxa

@adamfarley adamfarley requested a review from sxa October 14, 2025 08:28
@adamfarley adamfarley requested review from karianna and removed request for steelhead31 October 14, 2025 08:28
@adamfarley
Copy link
Contributor Author

adamfarley commented Oct 14, 2025

Note: The only "PR check" failures are the ones I skipped (windows/linux/mac builds).

@adamfarley adamfarley enabled auto-merge (squash) October 14, 2025 08:30
Signed-off-by: Adam Farley <[email protected]>
@adamfarley adamfarley requested review from andrew-m-leonard and steelhead31 and removed request for andrew-m-leonard, karianna and steelhead31 October 15, 2025 14:15
Copy link
Contributor

@steelhead31 steelhead31 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@adamfarley adamfarley merged commit 37e768f into adoptium:master Oct 15, 2025
29 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in 2025 Adoptium Plan Oct 15, 2025
@adamfarley
Copy link
Contributor Author

Thank you @sxa and @steelhead31 😎

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

solaris Issues that affect or relate to the SOLARIS OS testing Issues that enhance or fix our test suites

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants