MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix qsharp

This commit is contained in:
Radon Rosborough 2021-07-03 04:36:32 +00:00
parent 7ed020f4ce
commit dd99bdf778
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
langs/qsharp.yaml
View File

@ -9,9 +9,9 @@ install:
# 3.x of the .NET SDK. Not sure why. # 3.x of the .NET SDK. Not sure why.
prepare: &install-dotnet prepare: &install-dotnet
preface: | preface: |
sudo --preserve-env=DEBIAN_FRONTEND apt-get update
wget "https://packages.microsoft.com/config/ubuntu/${ubuntu_ver}/packages-microsoft-prod.deb" wget "https://packages.microsoft.com/config/ubuntu/${ubuntu_ver}/packages-microsoft-prod.deb"
sudo --preserve-env=DEBIAN_FRONTEND apt-get install ./packages-microsoft-prod.deb sudo --preserve-env=DEBIAN_FRONTEND apt-get install ./packages-microsoft-prod.deb
sudo --preserve-env=DEBIAN_FRONTEND apt-get update
apt: apt:
- $(grep-aptavail -wF Package "dotnet-sdk-3\.[0-9.]+" -s Package -n | sort -Vr | head -n1) - $(grep-aptavail -wF Package "dotnet-sdk-3\.[0-9.]+" -s Package -n | sort -Vr | head -n1)
<<: *install-dotnet <<: *install-dotnet
@ -33,6 +33,10 @@ install:
cp -R * "${HOME}/.dotnet" "${HOME}/.nuget" "${pkg}/opt/qsharp/skel/" cp -R * "${HOME}/.dotnet" "${HOME}/.nuget" "${pkg}/opt/qsharp/skel/"
rm "${pkg}/opt/qsharp/skel/main/Program.qs" rm "${pkg}/opt/qsharp/skel/main/Program.qs"
chmod -R a=u,go-w "${pkg}/opt/qsharp/skel" chmod -R a=u,go-w "${pkg}/opt/qsharp/skel"
manualInstall: |
wget "https://packages.microsoft.com/config/ubuntu/${ubuntu_ver}/packages-microsoft-prod.deb"
sudo --preserve-env=DEBIAN_FRONTEND apt-get update
sudo --preserve-env=DEBIAN_FRONTEND apt-get install ./packages-microsoft-prod.deb
setup: | setup: |
shopt -s dotglob shopt -s dotglob

11
tools/generate-build-script.js
View File

@ -340,6 +340,9 @@ latest_release() {
if (parts.join("\n\n").includes("ubuntu_name")) { if (parts.join("\n\n").includes("ubuntu_name")) {
parts.unshift(`ubuntu_name="$(lsb_release -cs)"`); parts.unshift(`ubuntu_name="$(lsb_release -cs)"`);
} }
if (parts.join("\n\n").includes("ubuntu_ver")) {
parts.unshift(`ubuntu_ver="$(lsb_release -rs)"`);
}
if (install && install.disallowCI) { if (install && install.disallowCI) {
parts.unshift(`\ parts.unshift(`\
if [[ -n "\${CI:-}" ]]; then if [[ -n "\${CI:-}" ]]; then
@ -372,7 +375,7 @@ function makeInstallScript(langConfig) {
let parts = []; let parts = [];
const { id, install } = langConfig; const { id, install } = langConfig;
if (install) { if (install) {
const { apt, cert, aptKey, aptRepo } = install; const { apt, cert, aptKey, aptRepo, manualInstall } = install;
if (apt && apt.filter((pkg) => pkg.includes(":i386")).length > 0) { if (apt && apt.filter((pkg) => pkg.includes(":i386")).length > 0) {
parts.push(`\ parts.push(`\
sudo dpkg --add-architecture i386`); sudo dpkg --add-architecture i386`);
@ -408,10 +411,16 @@ sudo dpkg --add-architecture i386`);
${aptRepo.join("\n")} ${aptRepo.join("\n")}
EOF`); EOF`);
} }
if (manualInstall) {
parts.push(manualInstall);
}
} }
if (parts.join("\n\n").includes("ubuntu_name")) { if (parts.join("\n\n").includes("ubuntu_name")) {
parts.unshift(`ubuntu_name="$(lsb_release -cs)"`); parts.unshift(`ubuntu_name="$(lsb_release -cs)"`);
} }
if (parts.join("\n\n").includes("ubuntu_ver")) {
parts.unshift(`ubuntu_name="$(lsb_release -rs)"`);
}
parts.unshift(`\ parts.unshift(`\
#!/usr/bin/env bash #!/usr/bin/env bash

3
tools/jsonschema.yaml
View File

@ -627,6 +627,9 @@ properties:
manual: manual:
type: string type: string
minLength: 1 minLength: 1
manualInstall:
type: string
minLength: 1
deb: deb:
type: array type: array
items: items: