Skip to content

Commit

Permalink
Merge branch 'JuliaGraphics:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
soumitradev committed May 24, 2023
2 parents 044e64d + 881fdce commit ff32128
Show file tree
Hide file tree
Showing 81 changed files with 2,140 additions and 8,069 deletions.
27 changes: 27 additions & 0 deletions .drone.jsonnet
@@ -0,0 +1,27 @@
local Pipeline(os, arch, version) = {
kind: "pipeline",
name: os+" - "+arch+" - Julia "+version,
platform: {
os: os,
arch: arch
},
steps: [
{
name: "build",
image: "julia:"+version,
commands: [
"apt-get update",
"apt-get install -y xvfb xauth",
"xvfb-run julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
]
}
],
trigger: {
branch: ["master"]
}
};

[
# Pipeline("linux", "arm", "1.6"),
Pipeline("linux", "arm64", "1.6"),
]
21 changes: 21 additions & 0 deletions .drone.yml
@@ -0,0 +1,21 @@
---
kind: pipeline
name: linux - arm64 - Julia 1.6

platform:
os: linux
arch: arm64

steps:
- name: build
image: julia:1.6
commands:
- apt-get update
- apt-get install -y xvfb xauth
- "xvfb-run julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"

trigger:
branch:
- master

...
1 change: 1 addition & 0 deletions .gitattributes
@@ -0,0 +1 @@
.drone.jsonnet linguist-detectable=false
15 changes: 15 additions & 0 deletions .github/workflows/CompatHelper.yml
@@ -0,0 +1,15 @@
name: CompatHelper
on:
schedule:
- cron: 0 0 * * *
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Pkg.add("CompatHelper")
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
- name: CompatHelper.main()
run: julia -e 'using CompatHelper; CompatHelper.main()'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
15 changes: 15 additions & 0 deletions .github/workflows/TagBot.yml
@@ -0,0 +1,15 @@
name: TagBot
on:
issue_comment:
types:
- created
workflow_dispatch:
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}
101 changes: 101 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,101 @@
name: CI

on:
push:
branches: "master"
tags: ["*"]
pull_request:
release:

jobs:
test:
name: Julia ${{ join(matrix.*, ' - ') }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
julia-version:
- "1.6"
- "1"
- "nightly"
os:
- ubuntu-latest
- macos-latest
- windows-latest
julia-arch:
- x64
- x86
include:
- os: ubuntu-latest
prefix: xvfb-run
# 32-bit Julia binaries are not available on macOS
exclude:
- os: macOS-latest
julia-arch: x86

steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.julia-version }}
arch: ${{ matrix.julia-arch }}
- name: Cache artifacts
uses: actions/cache@v2
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@v1
with:
prefix: ${{ matrix.prefix }}
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
with:
file: lcov.info
- uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: lcov.info
flag-name: Julia ${{ join(matrix.*, ' - ') }}
parallel: true

finish:
needs: test
if: ${{ always() }}
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true

Documentation:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
with:
version: 1
- name: Cache artifacts
uses: actions/cache@v2
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/docs/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-docdeploy@v1
with:
prefix: xvfb-run
env:
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
57 changes: 0 additions & 57 deletions .travis.yml

This file was deleted.

11 changes: 8 additions & 3 deletions Project.toml
@@ -1,6 +1,6 @@
name = "Gtk"
uuid = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
version = "1.1.1"
version = "1.3.0"

[deps]
Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
Expand All @@ -9,9 +9,12 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
GTK3_jll = "77ec8976-b24b-556a-a1bf-49a033a670a6"
Glib_jll = "7746bdde-850d-59dc-9ae8-88ece973131d"
Graphics = "a2bd30eb-e257-5431-a919-1863eab51364"
JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Librsvg_jll = "925c91fb-5dd6-59dd-8e8c-345e74382d89"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
Scratch = "6c6a2e73-6563-6170-7368-637461726353"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Xorg_xkeyboard_config_jll = "33bec58e-1273-512f-9401-5d533626f822"
Expand All @@ -25,12 +28,14 @@ Cairo_jll = "1.16.0"
GTK3_jll = "3.24.11"
Glib_jll = "2.59.0"
Graphics = "0.4, 1"
Reexport = "0.2"
JLLWrappers = "1.4.0"
Reexport = "0.2, 1.0"
Scratch = "1"
Xorg_xkeyboard_config_jll = "2.27.0"
adwaita_icon_theme_jll = "3.33.92"
gdk_pixbuf_jll = "2.38.2"
hicolor_icon_theme_jll = "0.17.0"
julia = "1.3"
julia = "1.6"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
8 changes: 4 additions & 4 deletions README.md
@@ -1,14 +1,14 @@
# Julia interface to `Gtk+ 2` and `Gtk+ 3` GUI library
# Julia interface to `Gtk+ 3` GUI library

[![Build Status](https://travis-ci.org/JuliaGraphics/Gtk.jl.svg?branch=master)](https://travis-ci.org/JuliaGraphics/Gtk.jl)
[![Build status](https://ci.appveyor.com/api/projects/status/yup46w98wv672sag?svg=true)](https://ci.appveyor.com/project/tknopp/gtk-jl)
[![Project Status: Inactive – The project has reached a stable, usable state but is no longer being actively developed; support/maintenance will be provided as time allows.](https://www.repostatus.org/badges/latest/inactive.svg)](https://www.repostatus.org/#inactive)
[![CI](https://github.com/JuliaGraphics/Gtk.jl/workflows/CI/badge.svg)](https://github.com/JuliaGraphics/Gtk.jl/actions?query=workflow%3ACI)
[![Coverage Status](https://coveralls.io/repos/JuliaGraphics/Gtk.jl/badge.svg)](https://coveralls.io/r/JuliaGraphics/Gtk.jl)
[![codecov.io](https://codecov.io/github/JuliaGraphics/Gtk.jl/coverage.svg?branch=master)](https://codecov.io/github/JuliaGraphics/Gtk.jl?branch=master)
[![](https://img.shields.io/badge/docs-latest-blue.svg)](https://juliagraphics.github.io/Gtk.jl/latest)

GUI building, using the Gtk library: [https://www.gtk.org/](https://www.gtk.org/)

Complete Gtk documentation is available at [https://developer.gnome.org/gtk/stable](https://developer.gnome.org/gtk/stable)
Complete Gtk documentation is available at [https://www.gtk.org/docs](https://www.gtk.org/docs)

Documentation of this package can be found
[here](https://juliagraphics.github.io/Gtk.jl/latest/).
36 changes: 0 additions & 36 deletions appveyor.yml

This file was deleted.

13 changes: 10 additions & 3 deletions docs/make.jl
@@ -1,7 +1,9 @@
using Documenter, Gtk

makedocs(
format = Documenter.HTML(),
format = Documenter.HTML(
prettyurls = get(ENV, "CI", nothing) == "true"
),
modules = [Gtk],
sitename = "Gtk.jl",
authors = "...",
Expand All @@ -19,12 +21,17 @@ makedocs(
"manual/keyevents.md",
"manual/canvas.md",
"manual/customWidgets.md",
"manual/slider.md",
"manual/async.md",
"manual/nonreplusage.md",
"manual/packages.md"
],
"Reference" => "doc/reference.md",
],
)

deploydocs(repo = "github.com/JuliaGraphics/Gtk.jl.git",
target = "build")
deploydocs(
repo = "github.com/JuliaGraphics/Gtk.jl.git",
target = "build",
push_preview = true
)

0 comments on commit ff32128

Please sign in to comment.