Merge pull request #64 from musm/up

Switch CI to GH actions

.github/workflows/CI.yml

@@ -0,0 +1,41 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+    tags: '*'
+  pull_request:
+
+jobs:
+  test:
+    name: julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1.3'
+          - '1'
+          - 'nightly'
+        os:
+          - ubuntu-latest
+          - windows-latest
+        arch:
+          - x64
+        include:
+          - os: ubuntu-latest
+            prefix: xvfb-run
+          - os: windows-latest
+            version: '1'
+            arch: x86
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@latest
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: julia-actions/julia-buildpkg@latest
+      - uses: julia-actions/julia-runtest@latest
+        with:
+          prefix: ${{ matrix.prefix }}

.github/workflows/RegisterAction.yml

@@ -0,0 +1,14 @@
+name: RegisterAction
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: Version to register or component to bump
+        required: true
+jobs:
+  register:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: julia-actions/RegisterAction@latest
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,2 +1,3 @@
 deps/deps.jl
 deps/build.log
+Manifest.toml

LICENSE.md

@@ -1,22 +1,21 @@
-The ModernGL.jl package is licensed under the MIT "Expat" License:
+The MIT License (MIT)
+Copyright (c) 2014: Simon Danisch.
 
-> Copyright (c) 2014: Simon Danisch.
->
-> Permission is hereby granted, free of charge, to any person obtaining
-> a copy of this software and associated documentation files (the
-> "Software"), to deal in the Software without restriction, including
-> without limitation the rights to use, copy, modify, merge, publish,
-> distribute, sublicense, and/or sell copies of the Software, and to
-> permit persons to whom the Software is furnished to do so, subject to
-> the following conditions:
->
-> The above copyright notice and this permission notice shall be
-> included in all copies or substantial portions of the Software.
->
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-> IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-> CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-> TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-> SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

deps/build.jl

@@ -1,4 +1,4 @@
-debug_level = get(ENV, "MODERNGL_DEBUGGING", "false") == "true"
-open(joinpath(@__DIR__, "deps.jl"), "w") do io
-    println(io, "const enable_opengl_debugging = $debug_level")
-end
+debug_level = lowercase(get(ENV, "MODERNGL_DEBUGGING", "false")) == "true"
+open(joinpath(@__DIR__, "deps.jl"), "w") do io
+    println(io, "const enable_opengl_debugging = $debug_level")
+end

src/ModernGL.jl

@@ -1,9 +1,6 @@
 module ModernGL
 
 using Libdl
-const iswindows = Sys.iswindows
-const isunix = Sys.isunix
-const isapple = Sys.isapple
 
 function glXGetProcAddress(glFuncName)
     ccall((:glXGetProcAddress, "libGL.so.1"), Ptr{Cvoid}, (Ptr{UInt8},), glFuncName)
@@ -23,13 +20,13 @@ function wglGetProcAddress(glFuncName)
     ccall((:wglGetProcAddress, "opengl32"), Ptr{Cvoid}, (Ptr{UInt8},), glFuncName)
 end
 
-if isapple()
+if Sys.isapple()
     getprocaddress(glFuncName) = NSGetProcAddress(glFuncName)
-elseif isunix()
+elseif Sys.isunix()
     getprocaddress(glFuncName) = glXGetProcAddress(glFuncName)
 end
 
-if iswindows()
+if Sys.iswindows()
     getprocaddress(glFuncName) = wglGetProcAddress(glFuncName)
 end
 

src/functionloading.jl

@@ -39,7 +39,7 @@ macro glfunc(opengl_func)
     func_name_str   = string(func_name)
     ptr_expr        = :(getprocaddress_e($func_name_str))
 
-    if iswindows() # windows has some function pointers statically available and some not, this is how we deal with it:
+    if Sys.iswindows() # windows has some function pointers statically available and some not, this is how we deal with it:
         ptr = Libdl.dlsym_e(gl_lib, func_name)
         if (ptr != C_NULL)
             ptr_expr = :(($func_name_sym, "opengl32"))
@@ -70,12 +70,12 @@ macro glfunc(opengl_func)
     return esc(ret)
 end
 
-if iswindows()
+if Sys.iswindows()
     const gl_lib = Libdl.dlopen("opengl32")
 end
 
 include("glFunctions.jl")
 
-if iswindows()
+if Sys.iswindows()
     Libdl.dlclose(gl_lib)
 end

test/runtests.jl

@@ -2,9 +2,7 @@ import GLFW
 using ModernGL
 include("util.jl")
 
-function is_ci()
-	get(ENV, "TRAVIS", "") == "true" || get(ENV, "APPVEYOR", "") == "True" || get(ENV, "CI", "") == "True"
-end
+is_ci() = lowercase(get(ENV, "CI", "false")) == "true"
 
 if !is_ci() # only do test if not CI... this is for automated testing environments which fail for OpenGL stuff, but I'd like to test if at least including works