Skip to content
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.

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

GLCI fixes #5758

Merged
merged 21 commits into from
Nov 25, 2023
Merged

GLCI fixes #5758

merged 21 commits into from
Nov 25, 2023

Conversation

jangorecki
Copy link
Member

towards #5727

  • removed 3.4.4, 3.5.0 test jobs
  • updated urls to windows R binaries
  • cleanup old comments
  • remove docker builds

@jangorecki jangorecki marked this pull request as ready for review November 24, 2023 19:21
@jangorecki
Copy link
Member Author

jangorecki commented Nov 24, 2023

if we merge it to master before hotfix release, we can revert #5719 because #5718 will be solved at the root. Important to note that PR does not touch any files that are being part of the package so is safe to merge.

Copy link
Member

@tdhock tdhock left a comment

Choose a reason for hiding this comment

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

hi Jan it looks ok to me, but I am not really familiar with this, so not sure if I would be able to catch any issues.

@jangorecki jangorecki merged commit b34ac7b into master Nov 25, 2023
@jangorecki jangorecki deleted the glci5 branch November 25, 2023 14:12
.test-install-deps: &install-deps
- Rscript -e 'source(".ci/ci.R"); install.packages(dcf.dependencies("DESCRIPTION", which="most"), quiet=TRUE)'
- Rscript -e 'source(".ci/ci.R"); install.packages(dcf.dependencies("DESCRIPTION", which="all"), repos=file.path("file:", normalizePath("bus/mirror-packages/cran", mustWork=FALSE)), quiet=TRUE)'
Copy link
Member

Choose a reason for hiding this comment

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

I would start (e.g.) .ci/scripts/ and add .ci/scripts/test-install-deps.R with:

source(".ci/ci.R")
install.packages(
  dcf.dependencies("DESCRIPTION", which="all"),
  repos=file.path("file:", normalizePath("bus/mirror-packages/cran", mustWork=FALSE)),
  quiet=TRUE
)

This will be more readable and avoid duplication (and hence double maintenance/risk of getting out of sync) across test-intall-deps and test-install-deps-win jobs.

Copy link
Member

@MichaelChirico MichaelChirico Nov 27, 2023

Choose a reason for hiding this comment

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

Or, we can find a way to put RUN_SCRIPT=if(win) Rscript.exe else Rscript into env and unify the jobs.

(just noticing the other small diff on Windows getwd(), so it's probably best to write this into the suggested script)

Copy link
Member Author

Choose a reason for hiding this comment

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

Quoting arguments from shell also differs

Copy link
Member Author

Choose a reason for hiding this comment

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

I would start (e.g.) .ci/scripts/ and add .ci/scripts/test-install-deps.R with:

source(".ci/ci.R")
install.packages(
  dcf.dependencies("DESCRIPTION", which="all"),
  repos=file.path("file:", normalizePath("bus/mirror-packages/cran", mustWork=FALSE)),
  quiet=TRUE
)

This will be more readable and avoid duplication (and hence double maintenance/risk of getting out of sync) across test-intall-deps and test-install-deps-win jobs.

Unless we will need distinction for some reason, then we ended up having two scripts :)

Copy link
Member

Choose a reason for hiding this comment

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

Quoting arguments from shell also differs

Can't we unify if there's no env inside "? Anyway, if the shell command is just Rscript -e "source(...)" it will still be easier to glance & see it looks ~OK.

Unless we will need distinction for some reason, then we ended up having two scripts :)

Looks like not the case yet, we can do some .Platform/Sys.info() switching to handle the small differences. Still almost all of the logic between the two jobs is the same, I find it more confusing needing to read long one-line scripts without syntax highlighting.

# flags: gcc -O3 -flto -fno-common -Wunused-result
# tests for compilation warnings
# measure memory usage during tests
test-rel-lin:
Copy link
Member

Choose a reason for hiding this comment

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

lin is linux here? I would just write out linux I don't see much benefit to saving 2 characters

Copy link
Member Author

@jangorecki jangorecki Nov 27, 2023

Choose a reason for hiding this comment

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

Yes, it is 3 letters so it aligns better when printing, to win and mac. Maybe lnx then?

Copy link
Member

Choose a reason for hiding this comment

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

That would be less ambiguous, yes

@MichaelChirico
Copy link
Member

hi Jan it looks ok to me, but I am not really familiar with this, so not sure if I would be able to catch any issues.

Ditto, basically LGTM but I don't follow 100%. It's just CI though, issues should be easy to detect/fix later, effects on package code are second-order only (e.g. if a mistake in CI eventually lets a mistake pass through PR review unnoticed)

@jangorecki
Copy link
Member Author

These CI runs on master so after PR being merged already. Design was made that ghci gives fast feedback and let us do merge, while glci tests thoroughly and we don't have to wait for it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants