Skip to content

Commit 0f8c485

Browse files
authored
snapd: follow //snapcraft.io/docs/gpu-support (#106)
1 parent 3a8bac1 commit 0f8c485

File tree

4 files changed

+296
-98
lines changed

4 files changed

+296
-98
lines changed

.github/workflows/workflow.yml

+38-38
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,44 @@ jobs:
2323
- uses: actions/checkout@v2
2424
- run: bazelisk build voidstar
2525

26-
build_on_windows:
27-
name: Build on windows
28-
runs-on: windows-latest
29-
steps:
30-
- uses: actions/checkout@v2
26+
# build_on_windows: FIXME
27+
# name: Build on windows
28+
# runs-on: windows-latest
29+
# steps:
30+
# - uses: actions/checkout@v2
3131

32-
# Trying to install & use GCC
33-
# From https://github.com/onqtam/doctest/pull/285/files
34-
- name: Install (Windows)
35-
shell: powershell
36-
run: |
37-
Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
38-
scoop install ninja --global
39-
#if ("${{ matrix.compiler }}".StartsWith("clang")) {
40-
# scoop install llvm --global
41-
#}
42-
#if ("${{ matrix.compiler }}" -eq "gcc") {
43-
# Chocolatey GCC is broken on the windows-2019 image.
44-
# See: https://github.com/DaanDeMeyer/doctest/runs/231595515
45-
# See: https://github.community/t5/GitHub-Actions/Something-is-wrong-with-the-chocolatey-installed-version-of-gcc/td-p/32413
46-
scoop install gcc --global
47-
echo "::set-env name=CC::gcc"
48-
echo "::set-env name=CXX::g++"
49-
#} elseif ("${{ matrix.compiler }}" -eq "clang") {
50-
# echo "::set-env name=CC::clang"
51-
# echo "::set-env name=CXX::clang++"
52-
#} else {
53-
# echo "::set-env name=CC::${{ matrix.compiler }}"
54-
# echo "::set-env name=CXX::${{ matrix.compiler }}"
55-
#}
56-
# Scoop modifies the PATH so we make the modified PATH global.
57-
echo "::set-env name=PATH::$env:PATH"
58-
- name: Configure x64
59-
run: .github\workflows\vsenv.bat -arch=x64 -host_arch=x64
32+
# # Trying to install & use GCC
33+
# # From https://github.com/onqtam/doctest/pull/285/files
34+
# - name: Install (Windows)
35+
# shell: powershell
36+
# run: |
37+
# Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
38+
# scoop install ninja --global
39+
# #if ("${{ matrix.compiler }}".StartsWith("clang")) {
40+
# # scoop install llvm --global
41+
# #}
42+
# #if ("${{ matrix.compiler }}" -eq "gcc") {
43+
# # Chocolatey GCC is broken on the windows-2019 image.
44+
# # See: https://github.com/DaanDeMeyer/doctest/runs/231595515
45+
# # See: https://github.community/t5/GitHub-Actions/Something-is-wrong-with-the-chocolatey-installed-version-of-gcc/td-p/32413
46+
# scoop install gcc --global
47+
# echo "::set-env name=CC::gcc"
48+
# echo "::set-env name=CXX::g++"
49+
# #} elseif ("${{ matrix.compiler }}" -eq "clang") {
50+
# # echo "::set-env name=CC::clang"
51+
# # echo "::set-env name=CXX::clang++"
52+
# #} else {
53+
# # echo "::set-env name=CC::${{ matrix.compiler }}"
54+
# # echo "::set-env name=CXX::${{ matrix.compiler }}"
55+
# #}
56+
# # Scoop modifies the PATH so we make the modified PATH global.
57+
# echo "::set-env name=PATH::$env:PATH"
58+
# - name: Configure x64
59+
# run: .github\workflows\vsenv.bat -arch=x64 -host_arch=x64
6060

61-
- shell: bash
62-
run: |
63-
gcc --version || true
64-
clang --version || true
61+
# - shell: bash
62+
# run: |
63+
# gcc --version || true
64+
# clang --version || true
6565

66-
- run: bazelisk build voidstar
66+
# - run: bazelisk build voidstar

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ voidstar: $(BAZEL)
66
$(BAZEL):
77
curl -fsSLo $@ $$( \
88
curl --silent --location --head --output /dev/null --write-out '%{url_effective}' -- https://github.com/bazelbuild/bazelisk/releases/latest \
9-
| sed 's%/tag/%/download/%;s%$$%/bazelisk-linux-amd64%' ) \
10-
&& chmod +x $@
9+
| sed "s%/tag/%/download/%;s%$$%/bazelisk-linux-$$(dpkg --print-architecture)%" )
10+
chmod +x $@
1111

1212
install: DESTDIR ?= .
1313
install:

0 commit comments

Comments
 (0)