Skip to content

Commit cb58c40

Browse files
arhikarhik
authored
Merge pull request #5 from arhik/main
Fixes GLFW X11 headless issue
2 parents fd47907 + 52eb779 commit cb58c40

File tree

15 files changed

+274
-89
lines changed

15 files changed

+274
-89
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: CI
2+
on:
3+
push:
4+
branches:
5+
- main
6+
tags: ['*']
7+
pull_request:
8+
concurrency:
9+
# Skip intermediate builds: always.
10+
# Cancel intermediate builds: only if it is a pull request build.
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
13+
jobs:
14+
test:
15+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
16+
runs-on: ${{ matrix.os }}
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
version:
21+
- '1.8'
22+
- 'nightly'
23+
os:
24+
- ubuntu-latest
25+
arch:
26+
- x64
27+
steps:
28+
- uses: actions/checkout@v2
29+
- uses: julia-actions/setup-julia@v1
30+
with:
31+
version: ${{ matrix.version }}
32+
arch: ${{ matrix.arch }}
33+
- uses: julia-actions/cache@v1
34+
- run : sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
35+
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; pkg"dev . WGPUNative"'
36+
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=wgpucore -e 'using Pkg; Pkg.test("WGPUCore", coverage=true)'
37+
- uses: julia-actions/julia-processcoverage@v1
38+
- uses: codecov/codecov-action@v2
39+
with:
40+
files: lcov.info
41+
docs:
42+
name: Documentation
43+
runs-on: ubuntu-latest
44+
permissions:
45+
contents: write
46+
steps:
47+
- uses: actions/checkout@v2
48+
- uses: julia-actions/setup-julia@v1
49+
with:
50+
version: '1'
51+
- run : sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
52+
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=docs -e 'using Pkg; pkg"dev . WGPUNative"'
53+
- run : DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=docs -e 'using Pkg; Pkg.test("WGPUCore", coverage=true)'
54+
- uses: julia-actions/julia-docdeploy@v1
55+
with:
56+
prefix: xvfb-run
57+
env:
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59+
- name: Generating Docs
60+
run: >
61+
DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24'
62+
julia --project=docs -e '
63+
using Documenter:DocMeta, doctest;
64+
using WGPUCore
65+
DocMeta.setdocmeta!(WGPUCore, :DocTestSetup, :(using WGPUCore); recursive=true)
66+
doctest(WGPUCore)
67+
'
68+

‎.github/workflows/CompatHelper.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: CompatHelper
2+
on:
3+
schedule:
4+
- cron: 0 0 * * *
5+
workflow_dispatch:
6+
jobs:
7+
CompatHelper:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Pkg.add("CompatHelper")
11+
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
12+
- name: CompatHelper.main()
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
16+
run: julia -e 'using CompatHelper; CompatHelper.main()'

‎.github/workflows/TagBot.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: TagBot
2+
on:
3+
issue_comment:
4+
types:
5+
- created
6+
workflow_dispatch:
7+
jobs:
8+
TagBot:
9+
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: JuliaRegistries/TagBot@v1
13+
with:
14+
token: ${{ secrets.GITHUB_TOKEN }}
15+
ssh: ${{ secrets.DOCUMENTER_KEY }}

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
.DS_Store
2-
test/vertexBufferLayoutTest.jl_
1+
*.jl.*.cov
2+
*.jl.cov
3+
*.jl.mem
4+
/Manifest.toml
5+
/docs/build/

LICENSE.md renamed to LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 arhik
3+
Copyright (c) 2022 arhik <[email protected]> and contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Manifest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.8.2"
44
manifest_format = "2.0"
5-
project_hash = "2760e5b28ac20c0569960c8a1188e187a765d1b3"
5+
project_hash = "f9b18466b02d2acc7d71241dcbcfa004964ad78d"
66

77
[[deps.Aqua]]
88
deps = ["Compat", "Pkg", "Test"]

‎Project.toml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@ GLFW_jll = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
1010
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1111
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1212
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
13-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1413
WGPUNative = "c14bfd16-04f9-4c2f-a915-b355584b5509"
1514

15+
[extras]
16+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
17+
18+
[targets]
19+
test = ["Test"]
20+
1621
[compat]
1722
CEnum = "^0.4"
1823
Reexport = "^1.2"

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# WGPUCore.jl
2-
3-
WGPU Native Core based graphics engine
1+
# WGPUCore
42

3+
[![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://arhik.github.io/WGPUCore.jl/stable/)
4+
[![Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://arhik.github.io/WGPUCore.jl/dev/)
5+
[![Build Status](https://github.com/arhik/WGPUCore.jl/actions/workflows/CI.yml/badge.svg?branch=main)](https://github.com/arhik/WGPUCore.jl/actions/workflows/CI.yml?query=branch%3Amain)
6+
[![Coverage](https://codecov.io/gh/arhik/WGPUCore.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/arhik/WGPUCore.jl)
57

8+
WGPU Native Core based graphics engine
69

‎docs/Manifest.toml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# This file is machine-generated - editing it directly is not advised
2+
3+
julia_version = "1.8.2"
4+
manifest_format = "2.0"
5+
project_hash = "afd31fcb279e21b87e3d69640a785588d0a25a9a"
6+
7+
[[deps.ANSIColoredPrinters]]
8+
git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c"
9+
uuid = "a4c015fc-c6ff-483c-b24f-f7ea428134e9"
10+
version = "0.0.1"
11+
12+
[[deps.Base64]]
13+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
14+
15+
[[deps.Dates]]
16+
deps = ["Printf"]
17+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
18+
19+
[[deps.DocStringExtensions]]
20+
deps = ["LibGit2"]
21+
git-tree-sha1 = "5158c2b41018c5f7eb1470d558127ac274eca0c9"
22+
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
23+
version = "0.9.1"
24+
25+
[[deps.Documenter]]
26+
deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
27+
git-tree-sha1 = "6030186b00a38e9d0434518627426570aac2ef95"
28+
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
29+
version = "0.27.23"
30+
31+
[[deps.IOCapture]]
32+
deps = ["Logging", "Random"]
33+
git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a"
34+
uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
35+
version = "0.2.2"
36+
37+
[[deps.InteractiveUtils]]
38+
deps = ["Markdown"]
39+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
40+
41+
[[deps.JSON]]
42+
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
43+
git-tree-sha1 = "3c837543ddb02250ef42f4738347454f95079d4e"
44+
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
45+
version = "0.21.3"
46+
47+
[[deps.LibGit2]]
48+
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
49+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
50+
51+
[[deps.Logging]]
52+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
53+
54+
[[deps.Markdown]]
55+
deps = ["Base64"]
56+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
57+
58+
[[deps.Mmap]]
59+
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
60+
61+
[[deps.NetworkOptions]]
62+
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
63+
version = "1.2.0"
64+
65+
[[deps.Parsers]]
66+
deps = ["Dates"]
67+
git-tree-sha1 = "6c01a9b494f6d2a9fc180a08b182fcb06f0958a0"
68+
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
69+
version = "2.4.2"
70+
71+
[[deps.Printf]]
72+
deps = ["Unicode"]
73+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
74+
75+
[[deps.REPL]]
76+
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
77+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
78+
79+
[[deps.Random]]
80+
deps = ["SHA", "Serialization"]
81+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
82+
83+
[[deps.SHA]]
84+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
85+
version = "0.7.0"
86+
87+
[[deps.Serialization]]
88+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
89+
90+
[[deps.Sockets]]
91+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
92+
93+
[[deps.Test]]
94+
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
95+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
96+
97+
[[deps.Unicode]]
98+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
99+
100+
[[deps.WGPUCore]]
101+
path = ".."
102+
uuid = "53d714bf-0d76-4802-84b4-6cb75cca55f5"
103+
version = "0.1.1"

‎docs/Project.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[deps]
2+
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
3+
WGPUCore = "53d714bf-0d76-4802-84b4-6cb75cca55f5"

0 commit comments

Comments
 (0)