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

fix: allow specifying the vcpkg version + fix: fix check for apt package installs + feat: allow parallel apt-get calls #257

Merged
merged 6 commits into from
Aug 12, 2024

Conversation

aminya
Copy link
Owner

@aminya aminya commented Aug 12, 2024

Fixes #22

@aminya aminya changed the title fix: allow specifying the vcpkg version + fix: fix check for apt package installs fix: allow specifying the vcpkg version + fix: fix check for apt package installs + allow parallel apt-get calls Aug 12, 2024
@aminya aminya changed the title fix: allow specifying the vcpkg version + fix: fix check for apt package installs + allow parallel apt-get calls fix: allow specifying the vcpkg version + fix: fix check for apt package installs + feat: allow parallel apt-get calls Aug 12, 2024
@aminya aminya merged commit bcd2a42 into master Aug 12, 2024
16 of 17 checks passed
@aminya aminya deleted the vcpkg-version branch August 12, 2024 18:05
Copy link

@bjosv bjosv left a comment

Choose a reason for hiding this comment

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

Found this while debugging an issue.

@@ -70,16 +70,16 @@ function nonInteractiveScript(script: string) {
// make the scirpt non-interactive and fix broken packages
return script.replace(
/add-apt-repository "\${REPO_NAME}"/g,
// eslint-disable-next-line no-template-curly-in-string
"add-apt-repository -y \"${REPO_NAME}\"",
`add-apt-repository -y -n "\${REPO_NAME}"
Copy link

Choose a reason for hiding this comment

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

The downloaded llvm.sh script contains add-apt-repository -y "${REPO_NAME}" so I don't think this replacement will be done.
The script also has an update afterwards which could be patch instead of adding the apt-get update.

See:
https://github.com/opencollab/llvm-jenkins.debian.net/blob/master/llvm.sh#L173-L174

Copy link
Owner Author

Choose a reason for hiding this comment

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

Looks like they added the flag recently. The code needs to be updated. Thanks for catching this.
opencollab/llvm-jenkins.debian.net@33f9c64

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

Successfully merging this pull request may close these issues.

Allow passing a vcpkg URL as the version of vcpkg
2 participants